[PHP-CVS] cvs: php-src(PHP_5_0) /main SAPI.c /sapi/cli php_cli.c
tony2001Wed Oct 19 19:08:16 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/main SAPI.c
/php-src/sapi/cli php_cli.c
Log:
MFH:
fixed bug #29983 (PHP does not explicitly set mime type charset)
+ call sapi_deactivate() when called with -m switch
http://cvs.php.net/diff.php/php-src/main/SAPI.c?r1=1.187.2.3r2=1.187.2.4ty=u
Index: php-src/main/SAPI.c
diff -u php-src/main/SAPI.c:1.187.2.3 php-src/main/SAPI.c:1.187.2.4
--- php-src/main/SAPI.c:1.187.2.3 Tue Feb 22 09:46:15 2005
+++ php-src/main/SAPI.c Wed Oct 19 19:08:07 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: SAPI.c,v 1.187.2.3 2005/02/22 14:46:15 sniper Exp $ */
+/* $Id: SAPI.c,v 1.187.2.4 2005/10/19 23:08:07 tony2001 Exp $ */
#include ctype.h
#include sys/stat.h
@@ -749,6 +749,12 @@
/* Success-oriented. We set headers_sent to 1 here to avoid an
infinite loop
* in case of an error situation.
*/
+ if (SG(sapi_headers).send_default_content_type
sapi_module.send_headers) {
+ sapi_header_struct default_header;
+ sapi_get_default_content_type_header(default_header TSRMLS_CC);
+ sapi_add_header_ex(default_header.header,
default_header.header_len, 0, 0 TSRMLS_CC);
+ }
+
SG(headers_sent) = 1;
if (sapi_module.send_headers) {
http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli.c?r1=1.113.2.3r2=1.113.2.4ty=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.113.2.3
php-src/sapi/cli/php_cli.c:1.113.2.4
--- php-src/sapi/cli/php_cli.c:1.113.2.3Thu Oct 6 16:36:45 2005
+++ php-src/sapi/cli/php_cli.c Wed Oct 19 19:08:14 2005
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: php_cli.c,v 1.113.2.3 2005/10/06 20:36:45 johannes Exp $ */
+/* $Id: php_cli.c,v 1.113.2.4 2005/10/19 23:08:14 tony2001 Exp $ */
#include php.h
#include php_globals.h
@@ -689,6 +689,7 @@
php_printf(\n);
php_end_ob_buffers(1 TSRMLS_CC);
exit_status=0;
+ sapi_deactivate(TSRMLS_C);
zend_ini_deactivate(TSRMLS_C);
goto out_err;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /main SAPI.c
sniper Tue Feb 22 09:46:17 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/main SAPI.c
Log:
MFH: nuke unused variables when PCRE is not compiled statically into PHP
http://cvs.php.net/diff.php/php-src/main/SAPI.c?r1=1.187.2.2r2=1.187.2.3ty=u
Index: php-src/main/SAPI.c
diff -u php-src/main/SAPI.c:1.187.2.2 php-src/main/SAPI.c:1.187.2.3
--- php-src/main/SAPI.c:1.187.2.2 Sun Nov 28 08:34:01 2004
+++ php-src/main/SAPI.c Tue Feb 22 09:46:15 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: SAPI.c,v 1.187.2.2 2004/11/28 13:34:01 sesser Exp $ */
+/* $Id: SAPI.c,v 1.187.2.3 2005/02/22 14:46:15 sniper Exp $ */
#include ctype.h
#include sys/stat.h
@@ -599,8 +599,6 @@
sapi_update_response_code(302
TSRMLS_CC);
}
} else if (!STRCASECMP(header_line,
WWW-Authenticate)) { /* HTTP Authentication */
- int newlen;
- char *result, *newheader;
sapi_update_response_code(401 TSRMLS_CC); /*
authentication-required */
@@ -608,8 +606,8 @@
#if (HAVE_PCRE || HAVE_BUNDLED_PCRE) !defined(COMPILE_DL_PCRE)
{
zval *repl_temp;
- char *ptr = colon_offset+1;
- int ptr_len=0, result_len = 0;
+ char *ptr = colon_offset+1, *result,
*newheader;
+ int ptr_len=0, result_len = 0, newlen =
0;
/* skip white space */
while (isspace(*ptr)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /main SAPI.c
sesser Sun Nov 28 08:34:01 2004 EDT Modified files: (Branch: PHP_5_0) /php-src/main SAPI.c Log: MFH http://cvs.php.net/diff.php/php-src/main/SAPI.c?r1=1.187.2.1r2=1.187.2.2ty=u Index: php-src/main/SAPI.c diff -u php-src/main/SAPI.c:1.187.2.1 php-src/main/SAPI.c:1.187.2.2 --- php-src/main/SAPI.c:1.187.2.1 Thu Aug 19 16:34:04 2004 +++ php-src/main/SAPI.c Sun Nov 28 08:34:01 2004 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: SAPI.c,v 1.187.2.1 2004/08/19 20:34:04 bfrance Exp $ */ +/* $Id: SAPI.c,v 1.187.2.2 2004/11/28 13:34:01 sesser Exp $ */ #include ctype.h #include sys/stat.h @@ -290,9 +290,13 @@ /* SG(sapi_headers).http_response_code = 200; */ SG(sapi_headers).http_status_line = NULL; + SG(read_post_bytes) = 0; + SG(request_info).post_data = NULL; + SG(request_info).raw_post_data = NULL; SG(request_info).current_user = NULL; SG(request_info).current_user_length = 0; SG(request_info).no_headers = 0; + SG(request_info).post_entry = NULL; /* * It's possible to override this general case in the activate() callback, -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
