From 3cf1565d905c954258b65c8a4995e56335035164 Mon Sep 17 00:00:00 2001
From: Antony Dovgal <tony2001@php.net>
Date: Thu, 10 Aug 2006 13:44:00 +0000
Subject: [PATCH] typos in comments and other minor improvements

---
 ext/mysqli/tests/028.phpt             | 4 ++--
 ext/standard/tests/file/bug22414.phpt | 1 -
 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 021804540d0..0e897d86f8c 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 4f490ddf747..e1f9a5c025c 100644
--- a/ext/standard/tests/file/bug22414.phpt
+++ b/ext/standard/tests/file/bug22414.phpt
@@ -14,7 +14,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 346c2a462ed..02c67a17f35 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);
 }
 
@@ -525,7 +525,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 */