diff options
| author | Antony Dovgal <tony2001@php.net> | 2006-08-10 13:43:18 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2006-08-10 13:43:18 +0000 |
| commit | 1ec10ac8c7dc0d8302ba7cb83f6eafdffbdd3952 (patch) | |
| tree | 6e70ed905ef7d95b20a71d04e8c56c6254295f77 | |
| parent | ae61bb7bb872e81d86afcda68b7a1324b33ef30f (diff) | |
| download | php-git-1ec10ac8c7dc0d8302ba7cb83f6eafdffbdd3952.tar.gz | |
typos in comments and other minor improvements
| -rw-r--r-- | ext/mysqli/tests/028.phpt | 4 | ||||
| -rw-r--r-- | ext/standard/tests/file/bug22414.phpt | 1 | ||||
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 6 |
3 files changed, 5 insertions, 6 deletions
diff --git a/ext/mysqli/tests/028.phpt b/ext/mysqli/tests/028.phpt index 021804540d..0e897d86f8 100644 --- a/ext/mysqli/tests/028.phpt +++ b/ext/mysqli/tests/028.phpt @@ -15,5 +15,5 @@ function test: mysqli_character_set_name mysqli_close($link); ?> ---EXPECT-- -string(6) "latin1" +--EXPECTF-- +string(%d) "%s" diff --git a/ext/standard/tests/file/bug22414.phpt b/ext/standard/tests/file/bug22414.phpt index f4f097d66d..0775fc8a7a 100644 --- a/ext/standard/tests/file/bug22414.phpt +++ b/ext/standard/tests/file/bug22414.phpt @@ -15,7 +15,6 @@ output_handler= 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 ; diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index b2c99f0d45..f3612bf137 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -232,12 +232,12 @@ php_apache_sapi_register_variables(zval *track_vars_array TSRMLS_DC) 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 @@ normal: /* 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 */ |