typos in comments and other minor improvements

diff --git a/ext/mysqli/tests/028.phpt b/ext/mysqli/tests/028.phpt
index 021804540d01fd48634bd36f069510d5d3cd3fb2..0e897d86f8cfe445e453d4099f231b652ef191d1 100644 (file)
--- 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 f4f097d66d130a6bd1589fd34f6b73c619a688a7..0775fc8a7a82ad6a064dcf7183687526416e0d37 100644 (file)
--- 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 b2c99f0d4560fc012b2513f9910bccd8d6d18706..f3612bf137a8efa3c8856f55ae76df48c7360134 100644 (file)
--- 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 */