Skip to content

Commit c3cf01b

Browse files
committed
Fix #78880: Yet another batch of spelling errors
1 parent 0b4778c commit c3cf01b

23 files changed

+33
-33
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ php
191191
/configure.bat
192192
/configure.js
193193

194-
# Generated by `/configure.(bat|js)` (architecture dependend)
194+
# Generated by `/configure.(bat|js)` (architecture dependent)
195195
/config.nice.bat
196196

197197
# NTS debug build x86

ext/fileinfo/tests/finfo_buffer_basic-mb.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Test finfo_buffer() function : basic functionality
55
--FILE--
66
<?php
77
/* Prototype : string finfo_buffer(resource finfo, char *string [, int options [, resource context]])
8-
* Description: Return infromation about a string buffer.
8+
* Description: Return information about a string buffer.
99
* Source code: ext/fileinfo/fileinfo.c
1010
* Alias to functions:
1111
*/

ext/fileinfo/tests/finfo_buffer_basic.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Test finfo_buffer() function : basic functionality
55
--FILE--
66
<?php
77
/* Prototype : string finfo_buffer(resource finfo, char *string [, int options [, resource context]])
8-
* Description: Return infromation about a string buffer.
8+
* Description: Return information about a string buffer.
99
* Source code: ext/fileinfo/fileinfo.c
1010
* Alias to functions:
1111
*/

ext/fileinfo/tests/finfo_buffer_variation1-mb.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Test finfo_buffer() function : basic functionality
55
--FILE--
66
<?php
77
/* Prototype : string finfo_buffer(resource finfo, char *string [, int options [, resource context]])
8-
* Description: Return infromation about a string buffer.
8+
* Description: Return information about a string buffer.
99
* Source code: ext/fileinfo/fileinfo.c
1010
* Alias to functions:
1111
*/

ext/fileinfo/tests/finfo_buffer_variation1.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Test finfo_buffer() function : basic functionality
55
--FILE--
66
<?php
77
/* Prototype : string finfo_buffer(resource finfo, char *string [, int options [, resource context]])
8-
* Description: Return infromation about a string buffer.
8+
* Description: Return information about a string buffer.
99
* Source code: ext/fileinfo/fileinfo.c
1010
* Alias to functions:
1111
*/

ext/openssl/openssl.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -851,7 +851,7 @@ static int php_openssl_parse_config(struct php_x509_request * req, zval * option
851851
str = CONF_get_string(req->req_config, req->section_name, "encrypt_rsa_key");
852852
if (str == NULL) {
853853
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 */
855855
php_openssl_store_errors();
856856
}
857857
if (str != NULL && strcmp(str, "no") == 0) {

ext/snmp/tests/snmp2_set.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ var_dump($z);
105105
var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
106106
var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $oldvalue2));
107107

108-
echo "Multiple OID & type, singe value in array\n";
108+
echo "Multiple OID & type, single value in array\n";
109109
$z = snmp2_set($hostname, $communityWrite, array($oid1, $oid2), array('s', 's'), array($newvalue1), $timeout, $retries);
110110
var_dump($z);
111111
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
208208
bool(false)
209209
bool(true)
210210
bool(true)
211-
Multiple OID & type, singe value in array
211+
Multiple OID & type, single value in array
212212

213213
Warning: snmp2_set(): '%s': no value set in %s on line %d
214214
bool(false)

ext/snmp/tests/snmpset.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ var_dump($z);
105105
var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
106106
var_dump((snmpget($hostname, $communityWrite, $oid2, $timeout, $retries) === $oldvalue2));
107107

108-
echo "Multiple OID & type, singe value in array\n";
108+
echo "Multiple OID & type, single value in array\n";
109109
$z = snmpset($hostname, $communityWrite, array($oid1, $oid2), array('s', 's'), array($newvalue1), $timeout, $retries);
110110
var_dump($z);
111111
var_dump((snmpget($hostname, $communityWrite, $oid1, $timeout, $retries) === $oldvalue1));
@@ -208,7 +208,7 @@ Warning: snmpset(): '%s': no type set in %s on line %d
208208
bool(false)
209209
bool(true)
210210
bool(true)
211-
Multiple OID & type, singe value in array
211+
Multiple OID & type, single value in array
212212

213213
Warning: snmpset(): '%s': no value set in %s on line %d
214214
bool(false)

ext/standard/tests/array/array_filter_variation4.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ var_dump( array_filter($input, "callback1") );
3232
function callback2($input)
3333
{
3434
}
35-
echo "-- Callback funciton with parameter and without return --\n";
35+
echo "-- Callback function with parameter and without return --\n";
3636
var_dump( array_filter($input, "callback2") );
3737

3838

@@ -79,7 +79,7 @@ array(8) {
7979
["null"]=>
8080
NULL
8181
}
82-
-- Callback funciton with parameter and without return --
82+
-- Callback function with parameter and without return --
8383
array(0) {
8484
}
8585
-- Callback function without parameter and return --

ext/standard/tests/array/array_filter_variation7.phpt

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ echo "Anonymous callback function with reference parameter\n";
2424
var_dump( array_filter($input, function(&$input) { return ($input < 1); }) );
2525

2626
// anonymous callback function with null argument
27-
echo "Anonymous callback funciton with null argument\n";
27+
echo "Anonymous callback function with null argument\n";
2828
var_dump( array_filter($input, function() { return true; }) );
2929

3030
// anonymous callback function with argument and null statement
@@ -55,7 +55,7 @@ array(4) {
5555
[7]=>
5656
NULL
5757
}
58-
Anonymous callback funciton with null argument
58+
Anonymous callback function with null argument
5959
array(8) {
6060
[0]=>
6161
int(0)

sapi/fpm/fpm/events/poll.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ static int fpm_event_poll_add(struct fpm_event_s *ev) /* {{{ */
216216
return 0;
217217
}
218218

219-
zlog(ZLOG_ERROR, "poll: not enought space to add event (fd=%d)", ev->fd);
219+
zlog(ZLOG_ERROR, "poll: not enough space to add event (fd=%d)", ev->fd);
220220
return -1;
221221
}
222222
/* }}} */

sapi/fpm/fpm/fpm_conf.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -899,7 +899,7 @@ static int fpm_conf_process_all_pools() /* {{{ */
899899

900900
for (i = 0; i < strlen(ping); i++) {
901901
if (!isalnum(ping[i]) && ping[i] != '/' && ping[i] != '-' && ping[i] != '_' && ping[i] != '.' && ping[i] != '~') {
902-
zlog(ZLOG_ERROR, "[pool %s] the ping path '%s' must containt only the following characters '[alphanum]/_-.~'", wp->config->name, ping);
902+
zlog(ZLOG_ERROR, "[pool %s] the ping path '%s' must contain only the following characters '[alphanum]/_-.~'", wp->config->name, ping);
903903
return -1;
904904
}
905905
}

sapi/fpm/fpm/fpm_events.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ static void fpm_got_signal(struct fpm_event_s *ev, short which, void *arg) /* {{
8383
/* epoll_wait() may report signal fd before read events for a finished child
8484
* in the same bunch of events. Prevent immediate free of the child structure
8585
* and so the fpm_event_s instance. Otherwise use after free happens during
86-
* attemp to process following read event. */
86+
* attempt to process following read event. */
8787
fpm_event_set_timer(&children_bury_timer, 0, &fpm_postponed_children_bury, NULL);
8888
fpm_event_add(&children_bury_timer, 0);
8989
break;

sapi/fpm/fpm/fpm_log.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ int fpm_log_write(char *log_format) /* {{{ */
310310
continue;
311311
}
312312

313-
/* test if enought char after the header name + ': ' */
313+
/* test if enough char after the header name + ': ' */
314314
if (h->header_len <= format_len + 2) {
315315
h = (sapi_header_struct*)zend_llist_get_next_ex(&sapi_headers->headers, &pos);
316316
continue;

sapi/fpm/fpm/fpm_main.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1908,7 +1908,7 @@ consult the installation file that came with this distribution, or visit \n\
19081908
}
19091909

19101910
/*
1911-
* have to duplicate SG(request_info).path_translated to be able to log errrors
1911+
* have to duplicate SG(request_info).path_translated to be able to log errors
19121912
* php_fopen_primary_script seems to delete SG(request_info).path_translated on failure
19131913
*/
19141914
primary_script = estrdup(SG(request_info).path_translated);

sapi/fpm/fpm/fpm_signals.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ int fpm_signals_init_main() /* {{{ */
197197
}
198198

199199
if (0 > fcntl(sp[0], F_SETFD, FD_CLOEXEC) || 0 > fcntl(sp[1], F_SETFD, FD_CLOEXEC)) {
200-
zlog(ZLOG_SYSERROR, "falied to init signals: fcntl(F_SETFD, FD_CLOEXEC)");
200+
zlog(ZLOG_SYSERROR, "failed to init signals: fcntl(F_SETFD, FD_CLOEXEC)");
201201
return -1;
202202
}
203203

sapi/fpm/tests/fcgi.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ class Client
485485
}
486486

487487
/**
488-
* Execute a request to the FastCGI application asyncronously
488+
* Execute a request to the FastCGI application asynchronously
489489
*
490490
* This sends request to application and returns the assigned ID for that request.
491491
*

sapi/fpm/www.conf.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ pm.max_spare_servers = 3
275275
; - %{micro}d
276276
; %e: an environment variable (same as $_ENV or $_SERVER)
277277
; it must be associated with embraces to specify the name of the env
278-
; variable. Some exemples:
278+
; variable. Some examples:
279279
; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e
280280
; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e
281281
; %f: script filename

sapi/litespeed/lsapilib.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -937,7 +937,7 @@ static int lsapi_enterLVE( LSAPI_Request * pReq, uid_t uid )
937937
ret = (*fp_lve_enter)(s_lve, uid, -1, -1, &cookie);
938938
if ( ret < 0 )
939939
{
940-
lsapi_log("enter LVE (%d) : ressult: %d !\n", uid, ret );
940+
lsapi_log("enter LVE (%d) : result: %d !\n", uid, ret );
941941
LSAPI_perror_r(pReq, "LSAPI: lve_enter() failure, reached resource limit.", NULL );
942942
lsapi_lve_error( pReq );
943943
return -1;
@@ -957,7 +957,7 @@ static int lsapi_jailLVE( LSAPI_Request * pReq, uid_t uid, struct passwd * pw )
957957
ret = (*fp_lve_jail)( pw, error_msg );
958958
if ( ret < 0 )
959959
{
960-
lsapi_log("LSAPI: LVE jail(%d) ressult: %d, error: %s !\n",
960+
lsapi_log("LSAPI: LVE jail(%d) result: %d, error: %s !\n",
961961
uid, ret, error_msg );
962962
LSAPI_perror_r( pReq, "LSAPI: jail() failure.", NULL );
963963
return -1;

win32/build/confutils.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -2327,7 +2327,7 @@ function generate_phpize()
23272327
MF.WriteLine("var PHP_MINOR_VERSION=" + PHP_MINOR_VERSION);
23282328
MF.WriteLine("var PHP_RELEASE_VERSION=" + PHP_RELEASE_VERSION);
23292329
MF.WriteBlankLines(1);
2330-
MF.WriteLine("/* Genereted extensions list with mode (static/shared) */");
2330+
MF.WriteLine("/* Generated extensions list with mode (static/shared) */");
23312331

23322332
var count = extensions_enabled.length;
23332333
for (i in extensions_enabled) {
@@ -2338,7 +2338,7 @@ function generate_phpize()
23382338
}
23392339

23402340
MF.WriteBlankLines(2);
2341-
MF.WriteLine("/* Genereted win32/build/phpize.js.in */");
2341+
MF.WriteLine("/* Generated win32/build/phpize.js.in */");
23422342
MF.WriteBlankLines(1);
23432343
MF.Write(file_get_contents("win32/build/phpize.js.in"));
23442344
MF.Close();
@@ -3088,8 +3088,8 @@ function toolset_get_compiler_name(short)
30883088
return name;
30893089
} if (version >= 1920) {
30903090
/* NOTE - VS is intentional. Due to changes in recent Visual Studio
3091-
versioning scheme refering to the exact VC++ version is
3092-
hardly predictable. From this version on, it refers to
3091+
versioning scheme referring to the exact VC++ version is
3092+
hardly predictable. From this version on, it refers to
30933093
Visual Studio version and implies the default toolset.
30943094
When new versions are introduced, adapt also checks in
30953095
php_win32_image_compatible(), if needed. */

win32/build/mkdist.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ function extract_file_from_tarball($pkg, $filename, $dest_dir) /* {{{ */
284284
285285
EOT
286286
);
287-
/* list build-in extensions */
287+
/* list built-in extensions */
288288
$exts = get_loaded_extensions();
289289
fprintf($fp, "\r\nBuilt-in Extensions\r\n");
290290
fwrite($fp, "===========================\r\n");

win32/nice.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
* . PROCESS_MODE_BACKGROUND_BEGIN
5555
* . PROCESS_MODE_BACKGROUND_END
5656
* Process mode is not covered because it can easily forgotten to be changed
57-
* back and can cause unforseen side effects that is hard to debug. Besides
57+
* back and can cause unforeseen side effects that is hard to debug. Besides
5858
* that, these do generally not really fit into making a Windows somewhat
5959
* compatible nice() function.
6060
*/

win32/sendmail.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ static char *ErrorMessages[] =
114114

115115
/* This function is meant to unify the headers passed to to mail()
116116
* This means, use PCRE to transform single occurrences of \n or \r in \r\n
117-
* As a second step we also eleminate all \r\n occurrences which are:
117+
* As a second step we also eliminate all \r\n occurrences which are:
118118
* 1) At the start of the header
119119
* 2) At the end of the header
120120
* 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)
887887
/* Check for newline */
888888
Index += rlen;
889889

890-
/* SMPT RFC says \r\n is the only valid line ending, who are we to argue ;)
890+
/* SMTP RFC says \r\n is the only valid line ending, who are we to argue ;)
891891
* The response code must contain at least 5 characters ex. 220\r\n */
892892
if (Received < 5 || buf[Received - 1] != '\n' || buf[Received - 2] != '\r') {
893893
goto again;
@@ -958,7 +958,7 @@ static unsigned long GetAddr(LPSTR szHost)
958958
// Name: int FormatEmailAddress
959959
// Input:
960960
// Output:
961-
// Description: Formats the email address to remove any content ouside
961+
// Description: Formats the email address to remove any content outside
962962
// of the angle brackets < > as per RFC 2821.
963963
//
964964
// Returns the invalidly formatted mail address if the < > are

0 commit comments

Comments
 (0)