cvs: php-src(PHP_5_2) /ext/mysqli/tests 028.phpt /ext/standard/tests/file bug22414.phpt /sapi/apache2handler sapi_apache2.c

tony2001 Thu Aug 10 13:43:18 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/sapi/apache2handler sapi_apache2.c /php-src/ext/standard/tests/file bug22414.phpt /php-src/ext/mysqli/tests 028.phpt Log: typos in comments and other minor improvements http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.57.2.10.2.5&r2=1.57.2.10.2.6&diff_format=u Index: php-src/sapi/apache2handler/sapi_apache2.c diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.5 php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.6 --- php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.5 Tue Aug 8 13:34:14 2006 +++ php-src/sapi/apache2handler/sapi_apache2.c Thu Aug 10 13:43:18 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache2.c,v 1.57.2.10.2.5 2006/08/08 13:34:14 stas Exp $ */ +/* $Id: sapi_apache2.c,v 1.57.2.10.2.6 2006/08/10 13:43:18 tony2001 Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -232,12 +232,12 @@ php_struct *ctx = SG(server_context); const apr_array_header_t *arr = apr_table_elts(ctx->r->subprocess_env); char *key, *val; - + APR_ARRAY_FOREACH_OPEN(arr, key, val) if (!val) val = ""; php_register_variable(key, val, track_vars_array TSRMLS_CC); APR_ARRAY_FOREACH_CLOSE() - + php_register_variable("PHP_SELF", ctx->r->uri, track_vars_array TSRMLS_CC); } @@ -530,7 +530,7 @@ /* Setup the CGI variables if this is the main request */ if (r->main == NULL || - /* .. or if the sub-request envinronment differs from the main-request. */ + /* .. or if the sub-request environment differs from the main-request. */ r->subprocess_env != r->main->subprocess_env ) { /* setup standard CGI variables */ http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug22414.phpt?r1=1.10&r2=1.10.6.1&diff_format=u Index: php-src/ext/standard/tests/file/bug22414.phpt diff -u php-src/ext/standard/tests/file/bug22414.phpt:1.10 php-src/ext/standard/tests/file/bug22414.phpt:1.10.6.1 --- php-src/ext/standard/tests/file/bug22414.phpt:1.10 Fri Oct 24 03:31:54 2003 +++ php-src/ext/standard/tests/file/bug22414.phpt Thu Aug 10 13:43:18 2006 @@ -15,7 +15,6 @@ echo "\n"; /* Binary Data Test */ - @unlink($pwd . '/passthru_test'); $cmd = $php . ' -n -r \"readfile(@getenv(\'TEST_PHP_EXECUTABLE\')); \"'; $cmd = $php . ' -n -r \' passthru("'.$cmd.'"); \' > '.$tmpfile ; http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/028.phpt?r1=1.4&r2=1.4.4.1&diff_format=u Index: php-src/ext/mysqli/tests/028.phpt diff -u php-src/ext/mysqli/tests/028.phpt:1.4 php-src/ext/mysqli/tests/028.phpt:1.4.4.1 --- php-src/ext/mysqli/tests/028.phpt:1.4 Sat Dec 4 08:50:33 2004 +++ php-src/ext/mysqli/tests/028.phpt Thu Aug 10 13:43:18 2006 @@ -15,5 +15,5 @@ mysqli_close($link); ?> ---EXPECT-- -string(6) "latin1" +--EXPECTF-- +string(%d) "%s"