Fix #78880: Yet another batch of spelling errors

kocsismate · kocsismate · commit c3cf01b553b1 · 2020-01-16T12:04:00.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -191,7 +191,7 @@ php
 /configure.bat
 /configure.js
 
-# Generated by `/configure.(bat|js)` (architecture dependend)
+# Generated by `/configure.(bat|js)` (architecture dependent)
 /config.nice.bat
 
 # NTS debug build x86
diff --git a/ext/fileinfo/tests/finfo_buffer_basic-mb.phpt b/ext/fileinfo/tests/finfo_buffer_basic-mb.phpt
@@ -5,7 +5,7 @@ Test finfo_buffer() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : string finfo_buffer(resource finfo, char *string [, int options [, resource context]])
- * Description: Return infromation about a string buffer.
+ * Description: Return information about a string buffer.
  * Source code: ext/fileinfo/fileinfo.c
  * Alias to functions:
  */
diff --git a/ext/fileinfo/tests/finfo_buffer_basic.phpt b/ext/fileinfo/tests/finfo_buffer_basic.phpt
@@ -5,7 +5,7 @@ Test finfo_buffer() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : string finfo_buffer(resource finfo, char *string [, int options [, resource context]])
- * Description: Return infromation about a string buffer.
+ * Description: Return information about a string buffer.
  * Source code: ext/fileinfo/fileinfo.c
  * Alias to functions:
  */
diff --git a/ext/fileinfo/tests/finfo_buffer_variation1-mb.phpt b/ext/fileinfo/tests/finfo_buffer_variation1-mb.phpt
@@ -5,7 +5,7 @@ Test finfo_buffer() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : string finfo_buffer(resource finfo, char *string [, int options [, resource context]])
- * Description: Return infromation about a string buffer.
+ * Description: Return information about a string buffer.
  * Source code: ext/fileinfo/fileinfo.c
  * Alias to functions:
  */
diff --git a/ext/fileinfo/tests/finfo_buffer_variation1.phpt b/ext/fileinfo/tests/finfo_buffer_variation1.phpt
@@ -5,7 +5,7 @@ Test finfo_buffer() function : basic functionality
 --FILE--
 <?php
 /* Prototype  : string finfo_buffer(resource finfo, char *string [, int options [, resource context]])
- * Description: Return infromation about a string buffer.
+ * Description: Return information about a string buffer.
  * Source code: ext/fileinfo/fileinfo.c
  * Alias to functions:
  */
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
@@ -851,7 +851,7 @@ static int php_openssl_parse_config(struct php_x509_request * req, zval * option
 		str = CONF_get_string(req->req_config, req->section_name, "encrypt_rsa_key");
 		if (str == NULL) {
 			str = CONF_get_string(req->req_config, req->section_name, "encrypt_key");
-			/* it is sure that there are some errrors as str was NULL for encrypt_rsa_key */
+			/* it is sure that there are some errors as str was NULL for encrypt_rsa_key */
 			php_openssl_store_errors();
 		}
 		if (str != NULL && strcmp(str, "no") == 0) {
diff --git a/ext/snmp/tests/snmp2_set.phpt b/ext/snmp/tests/snmp2_set.phpt
@@ -105,7 +105,7 @@ var_dump($z);
 var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
 var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $oldvalue2));
 
-echo "Multiple OID & type, singe value in array\n";
+echo "Multiple OID & type, single value in array\n";
 $z = snmp2_set($hostname, $communityWrite, array($oid1, $oid2), array('s', 's'), array($newvalue1), $timeout, $retries);
 var_dump($z);
 var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
@@ -208,7 +208,7 @@ Warning: snmp2_set(): '%s': no type set in %s on line %d
 bool(false)
 bool(true)
 bool(true)
-Multiple OID & type, singe value in array
+Multiple OID & type, single value in array
 
 Warning: snmp2_set(): '%s': no value set in %s on line %d
 bool(false)
diff --git a/ext/snmp/tests/snmpset.phpt b/ext/snmp/tests/snmpset.phpt
@@ -105,7 +105,7 @@ var_dump($z);
 var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
 var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $oldvalue2));
 
-echo "Multiple OID & type, singe value in array\n";
+echo "Multiple OID & type, single value in array\n";
 $z = snmpset($hostname, $communityWrite, array($oid1, $oid2), array('s', 's'), array($newvalue1), $timeout, $retries);
 var_dump($z);
 var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
@@ -208,7 +208,7 @@ Warning: snmpset(): '%s': no type set in %s on line %d
 bool(false)
 bool(true)
 bool(true)
-Multiple OID & type, singe value in array
+Multiple OID & type, single value in array
 
 Warning: snmpset(): '%s': no value set in %s on line %d
 bool(false)
diff --git a/ext/standard/tests/array/array_filter_variation4.phpt b/ext/standard/tests/array/array_filter_variation4.phpt
@@ -32,7 +32,7 @@ var_dump( array_filter($input, "callback1") );
 function callback2($input)
 {
 }
-echo "-- Callback funciton with parameter and without return --\n";
+echo "-- Callback function with parameter and without return --\n";
 var_dump( array_filter($input, "callback2") );
 
 
@@ -79,7 +79,7 @@ array(8) {
   ["null"]=>
   NULL
 }
--- Callback funciton with parameter and without return --
+-- Callback function with parameter and without return --
 array(0) {
 }
 -- Callback function without parameter and return --
diff --git a/ext/standard/tests/array/array_filter_variation7.phpt b/ext/standard/tests/array/array_filter_variation7.phpt
@@ -24,7 +24,7 @@ echo "Anonymous callback function with reference parameter\n";
 var_dump( array_filter($input, function(&$input) { return ($input < 1); }) );
 
 // anonymous callback function with null argument
-echo "Anonymous callback funciton with null argument\n";
+echo "Anonymous callback function with null argument\n";
 var_dump( array_filter($input, function() { return true; }) );
 
 // anonymous callback function with argument and null statement
@@ -55,7 +55,7 @@ array(4) {
   [7]=>
   NULL
 }
-Anonymous callback funciton with null argument
+Anonymous callback function with null argument
 array(8) {
   [0]=>
   int(0)
diff --git a/sapi/fpm/fpm/events/poll.c b/sapi/fpm/fpm/events/poll.c
@@ -216,7 +216,7 @@ static int fpm_event_poll_add(struct fpm_event_s *ev) /* {{{ */
 		return 0;
 	}
 
-	zlog(ZLOG_ERROR, "poll: not enought space to add event (fd=%d)", ev->fd);
+	zlog(ZLOG_ERROR, "poll: not enough space to add event (fd=%d)", ev->fd);
 	return -1;
 }
 /* }}} */
diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c
@@ -899,7 +899,7 @@ static int fpm_conf_process_all_pools() /* {{{ */
 
 			for (i = 0; i < strlen(ping); i++) {
 				if (!isalnum(ping[i]) && ping[i] != '/' && ping[i] != '-' && ping[i] != '_' && ping[i] != '.' && ping[i] != '~') {
-					zlog(ZLOG_ERROR, "[pool %s] the ping path '%s' must containt only the following characters '[alphanum]/_-.~'", wp->config->name, ping);
+					zlog(ZLOG_ERROR, "[pool %s] the ping path '%s' must contain only the following characters '[alphanum]/_-.~'", wp->config->name, ping);
 					return -1;
 				}
 			}
diff --git a/sapi/fpm/fpm/fpm_events.c b/sapi/fpm/fpm/fpm_events.c
@@ -83,7 +83,7 @@ static void fpm_got_signal(struct fpm_event_s *ev, short which, void *arg) /* {{
 				/* epoll_wait() may report signal fd before read events for a finished child
 				 * in the same bunch of events. Prevent immediate free of the child structure
 				 * and so the fpm_event_s instance. Otherwise use after free happens during
-				 * attemp to process following read event. */
+				 * attempt to process following read event. */
 				fpm_event_set_timer(&children_bury_timer, 0, &fpm_postponed_children_bury, NULL);
 				fpm_event_add(&children_bury_timer, 0);
 				break;
diff --git a/sapi/fpm/fpm/fpm_log.c b/sapi/fpm/fpm/fpm_log.c
@@ -310,7 +310,7 @@ int fpm_log_write(char *log_format) /* {{{ */
 								continue;
 							}
 
-							/* test if enought char after the header name + ': ' */
+							/* test if enough char after the header name + ': ' */
 							if (h->header_len <= format_len + 2) {
 								h = (sapi_header_struct*)zend_llist_get_next_ex(&sapi_headers->headers, &pos);
 								continue;
diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
@@ -1908,7 +1908,7 @@ consult the installation file that came with this distribution, or visit \n\
 			}
 
 			/*
-			 * have to duplicate SG(request_info).path_translated to be able to log errrors
+			 * have to duplicate SG(request_info).path_translated to be able to log errors
 			 * php_fopen_primary_script seems to delete SG(request_info).path_translated on failure
 			 */
 			primary_script = estrdup(SG(request_info).path_translated);
diff --git a/sapi/fpm/fpm/fpm_signals.c b/sapi/fpm/fpm/fpm_signals.c
@@ -197,7 +197,7 @@ int fpm_signals_init_main() /* {{{ */
 	}
 
 	if (0 > fcntl(sp[0], F_SETFD, FD_CLOEXEC) || 0 > fcntl(sp[1], F_SETFD, FD_CLOEXEC)) {
-		zlog(ZLOG_SYSERROR, "falied to init signals: fcntl(F_SETFD, FD_CLOEXEC)");
+		zlog(ZLOG_SYSERROR, "failed to init signals: fcntl(F_SETFD, FD_CLOEXEC)");
 		return -1;
 	}
 
diff --git a/sapi/fpm/tests/fcgi.inc b/sapi/fpm/tests/fcgi.inc
@@ -485,7 +485,7 @@ class Client
     }
 
     /**
-     * Execute a request to the FastCGI application asyncronously
+     * Execute a request to the FastCGI application asynchronously
      *
      * This sends request to application and returns the assigned ID for that request.
      *
diff --git a/sapi/fpm/www.conf.in b/sapi/fpm/www.conf.in
@@ -275,7 +275,7 @@ pm.max_spare_servers = 3
 ;      - %{micro}d
 ;  %e: an environment variable (same as $_ENV or $_SERVER)
 ;      it must be associated with embraces to specify the name of the env
-;      variable. Some exemples:
+;      variable. Some examples:
 ;      - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e
 ;      - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e
 ;  %f: script filename
diff --git a/sapi/litespeed/lsapilib.c b/sapi/litespeed/lsapilib.c
@@ -937,7 +937,7 @@ static int lsapi_enterLVE( LSAPI_Request * pReq, uid_t uid )
         ret = (*fp_lve_enter)(s_lve, uid, -1, -1, &cookie);
         if ( ret < 0 )
         {
-            lsapi_log("enter LVE (%d) : ressult: %d !\n", uid, ret );
+            lsapi_log("enter LVE (%d) : result: %d !\n", uid, ret );
             LSAPI_perror_r(pReq, "LSAPI: lve_enter() failure, reached resource limit.", NULL );
             lsapi_lve_error( pReq );
             return -1;
@@ -957,7 +957,7 @@ static int lsapi_jailLVE( LSAPI_Request * pReq, uid_t uid, struct passwd * pw )
     ret = (*fp_lve_jail)( pw, error_msg );
     if ( ret < 0 )
     {
-        lsapi_log("LSAPI: LVE jail(%d) ressult: %d, error: %s !\n",
+        lsapi_log("LSAPI: LVE jail(%d) result: %d, error: %s !\n",
                   uid, ret, error_msg );
         LSAPI_perror_r( pReq, "LSAPI: jail() failure.", NULL );
         return -1;
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
@@ -2327,7 +2327,7 @@ function generate_phpize()
 	MF.WriteLine("var PHP_MINOR_VERSION=" + PHP_MINOR_VERSION);
 	MF.WriteLine("var PHP_RELEASE_VERSION=" + PHP_RELEASE_VERSION);
 	MF.WriteBlankLines(1);
-	MF.WriteLine("/* Genereted extensions list with mode (static/shared) */");
+	MF.WriteLine("/* Generated extensions list with mode (static/shared) */");
 
 	var count = extensions_enabled.length;
 	for (i in extensions_enabled) {
@@ -2338,7 +2338,7 @@ function generate_phpize()
 	}
 
 	MF.WriteBlankLines(2);
-	MF.WriteLine("/* Genereted win32/build/phpize.js.in */");
+	MF.WriteLine("/* Generated win32/build/phpize.js.in */");
 	MF.WriteBlankLines(1);
 	MF.Write(file_get_contents("win32/build/phpize.js.in"));
 	MF.Close();
@@ -3088,8 +3088,8 @@ function toolset_get_compiler_name(short)
 			return name;
 		} if (version >= 1920) {
 			/* NOTE - VS is intentional. Due to changes in recent Visual Studio
-						versioning scheme refering to the exact VC++ version is
-						hardly predictable. From this version on, it refers to 
+						versioning scheme referring to the exact VC++ version is
+						hardly predictable. From this version on, it refers to
 						Visual Studio version and implies the default toolset.
 						When new versions are introduced, adapt also checks in
 						php_win32_image_compatible(), if needed. */
diff --git a/win32/build/mkdist.php b/win32/build/mkdist.php
@@ -284,7 +284,7 @@ function extract_file_from_tarball($pkg, $filename, $dest_dir) /* {{{ */
 
 EOT
 );
-/* list build-in extensions */
+/* list built-in extensions */
 $exts = get_loaded_extensions();
 fprintf($fp, "\r\nBuilt-in Extensions\r\n");
 fwrite($fp, "===========================\r\n");
diff --git a/win32/nice.c b/win32/nice.c
@@ -54,7 +54,7 @@
  *   . PROCESS_MODE_BACKGROUND_BEGIN
  *   . PROCESS_MODE_BACKGROUND_END
  *     Process mode is not covered because it can easily forgotten to be changed
- *     back and can cause unforseen side effects that is hard to debug. Besides
+ *     back and can cause unforeseen side effects that is hard to debug. Besides
  *     that, these do generally not really fit into making a Windows somewhat
  *     compatible nice() function.
  */
diff --git a/win32/sendmail.c b/win32/sendmail.c
@@ -114,7 +114,7 @@ static char *ErrorMessages[] =
 
 /* This function is meant to unify the headers passed to to mail()
  * This means, use PCRE to transform single occurrences of \n or \r in \r\n
- * As a second step we also eleminate all \r\n occurrences which are:
+ * As a second step we also eliminate all \r\n occurrences which are:
  * 1) At the start of the header
  * 2) At the end of the header
  * 3) Two or more occurrences in the header are removed so only one is left
@@ -887,7 +887,7 @@ static int Ack(char **server_response)
 	/* Check for newline */
 	Index += rlen;
 
-	/* SMPT RFC says \r\n is the only valid line ending, who are we to argue ;)
+	/* SMTP RFC says \r\n is the only valid line ending, who are we to argue ;)
 	 * The response code must contain at least 5 characters ex. 220\r\n */
 	if (Received < 5 || buf[Received - 1] != '\n' || buf[Received - 2] != '\r') {
 		goto again;
@@ -958,7 +958,7 @@ static unsigned long GetAddr(LPSTR szHost)
 // Name:  int FormatEmailAddress
 // Input:
 // Output:
-// Description: Formats the email address to remove any content ouside
+// Description: Formats the email address to remove any content outside
 //   of the angle brackets < > as per RFC 2821.
 //
 //   Returns the invalidly formatted mail address if the < > are

Original file line number	Diff line number	Diff line change
`@@ -851,7 +851,7 @@ static int php_openssl_parse_config(struct php_x509_request * req, zval * option`
`851`	`851`	`str = CONF_get_string(req->req_config, req->section_name, "encrypt_rsa_key");`
`852`	`852`	`if (str == NULL) {`
`853`	`853`	`str = CONF_get_string(req->req_config, req->section_name, "encrypt_key");`
`854`		`- /* it is sure that there are some errrors as str was NULL for encrypt_rsa_key */`
	`854`	`+ /* it is sure that there are some errors as str was NULL for encrypt_rsa_key */`
`855`	`855`	`php_openssl_store_errors();`
`856`	`856`	`}`
`857`	`857`	`if (str != NULL && strcmp(str, "no") == 0) {`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ var_dump( array_filter($input, "callback1") );`
`32`	`32`	`function callback2($input)`
`33`	`33`	`{`
`34`	`34`	`}`
`35`		`-echo "-- Callback funciton with parameter and without return --\n";`
	`35`	`+echo "-- Callback function with parameter and without return --\n";`
`36`	`36`	`var_dump( array_filter($input, "callback2") );`
`37`	`37`
`38`	`38`
`@@ -79,7 +79,7 @@ array(8) {`
`79`	`79`	`["null"]=>`
`80`	`80`	`NULL`
`81`	`81`	`}`
`82`		`--- Callback funciton with parameter and without return --`
	`82`	`+-- Callback function with parameter and without return --`
`83`	`83`	`array(0) {`
`84`	`84`	`}`
`85`	`85`	`-- Callback function without parameter and return --`