diff options
Diffstat (limited to 'sapi')
-rw-r--r-- | sapi/cgi/cgi_main.c | 2 | ||||
-rw-r--r-- | sapi/cli/php_http_parser.c | 2 | ||||
-rw-r--r-- | sapi/fpm/fpm/fpm_env.c | 2 | ||||
-rw-r--r-- | sapi/litespeed/lsapilib.c | 2 | ||||
-rw-r--r-- | sapi/nsapi/nsapi-readme.txt | 2 | ||||
-rw-r--r-- | sapi/phpdbg/phpdbg.c | 2 | ||||
-rw-r--r-- | sapi/phpdbg/xml.md | 6 | ||||
-rw-r--r-- | sapi/thttpd/thttpd_patch | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index f06787543e..2d67321773 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -2280,7 +2280,7 @@ consult the installation file that came with this distribution, or visit \n\ /* all remaining arguments are part of the query string * this section of code concatenates all remaining arguments - * into a single string, seperating args with a & + * into a single string, separating args with a & * this allows command lines like: * * test.php v1=test v2=hello+world! diff --git a/sapi/cli/php_http_parser.c b/sapi/cli/php_http_parser.c index cc649af79a..31ae4167d1 100644 --- a/sapi/cli/php_http_parser.c +++ b/sapi/cli/php_http_parser.c @@ -1378,7 +1378,7 @@ size_t php_http_parser_execute (php_http_parser *parser, /* Here we call the headers_complete callback. This is somewhat * different than other callbacks because if the user returns 1, we * will interpret that as saying that this message has no body. This - * is needed for the annoying case of recieving a response to a HEAD + * is needed for the annoying case of receiving a response to a HEAD * request. */ if (settings->on_headers_complete) { diff --git a/sapi/fpm/fpm/fpm_env.c b/sapi/fpm/fpm/fpm_env.c index 2ff0bdc0e4..3bdb346341 100644 --- a/sapi/fpm/fpm/fpm_env.c +++ b/sapi/fpm/fpm/fpm_env.c @@ -212,7 +212,7 @@ int fpm_env_init_main() /* {{{ */ #ifndef HAVE_SETPROCTITLE #ifdef __linux__ /* - * This piece of code has been inspirated from nginx and pureftpd code, whic + * This piece of code has been inspirated from nginx and pureftpd code, which * are under BSD licence. * * To change the process title in Linux we have to set argv[1] to NULL diff --git a/sapi/litespeed/lsapilib.c b/sapi/litespeed/lsapilib.c index cf63f6ab1c..daf0f37f14 100644 --- a/sapi/litespeed/lsapilib.c +++ b/sapi/litespeed/lsapilib.c @@ -2662,7 +2662,7 @@ static void lsapi_check_child_status( long tmCur ) } if ( abs( g_prefork_server->m_iCurChildren - count ) > 1 ) { - fprintf( stderr, "Children tracking is wrong: PID: %d, Cur Childen: %d, count: %d, idle: %d, dying: %d\n", getpid(), + fprintf( stderr, "Children tracking is wrong: PID: %d, Cur Children: %d, count: %d, idle: %d, dying: %d\n", getpid(), g_prefork_server->m_iCurChildren, count, idle, dying ); } diff --git a/sapi/nsapi/nsapi-readme.txt b/sapi/nsapi/nsapi-readme.txt index 812507957e..6bf4afb83d 100644 --- a/sapi/nsapi/nsapi-readme.txt +++ b/sapi/nsapi/nsapi-readme.txt @@ -1,7 +1,7 @@ Configuration of your Netscape/iPlanet/Sun Webserver for PHP7 ----------------------------------------------------------------- -These instructions are targetted at Netscape Enterprise Web Server and +These instructions are targeted at Netscape Enterprise Web Server and SUN/Netscape Alliance iPlanet Web Server and the new Sun Java System Webserver. On other web servers your milage may vary. diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index ec65a22f12..c624669785 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -1571,7 +1571,7 @@ phpdbg_out: #ifdef _WIN32 } __except(phpdbg_exception_handler_win32(xp = GetExceptionInformation())) { - phpdbg_error("segfault", "", "Access violation (Segementation fault) encountered\ntrying to abort cleanly..."); + phpdbg_error("segfault", "", "Access violation (Segmentation fault) encountered\ntrying to abort cleanly..."); } phpdbg_out: #endif diff --git a/sapi/phpdbg/xml.md b/sapi/phpdbg/xml.md index 7871b31376..56dcaaa1f7 100644 --- a/sapi/phpdbg/xml.md +++ b/sapi/phpdbg/xml.md @@ -225,7 +225,7 @@ frame - internal: has value "internal" when being an internal function call (one cannot inspect that frame) - being an error: (by type) - - maxnum: tried to access a frame with a number heigher than existing (or < 0) + - maxnum: tried to access a frame with a number higher than existing (or < 0) ### attributes on <arg> ### @@ -378,7 +378,7 @@ exec - command executing and compiling a given file - <exec type="unset" context="" />: indicates unsetting of the old context - <exec type="unsetops" />: indicates unsetting of the old compiled opcodes - - <exec type="unchanged" />: same execution context choosen again + - <exec type="unchanged" />: same execution context chosen again - <exec type="set" context="" />: indicates setting of the new context - errors by tag - <compile> @@ -527,7 +527,7 @@ set ### breaks ### -- generally enables / disables breakpoint functionality silently with no futher xml answer +- generally enables / disables breakpoint functionality silently with no further xml answer - if the boolean switch is omitted, it emits current state in a <setbreaks active="" /> where active is on or off ### color ### diff --git a/sapi/thttpd/thttpd_patch b/sapi/thttpd/thttpd_patch index 1a9ed29d60..1463d8fe0a 100644 --- a/sapi/thttpd/thttpd_patch +++ b/sapi/thttpd/thttpd_patch @@ -2059,7 +2059,7 @@ diff -ur thttpd-2.21b/thttpd.c thttpd-2.21b-cool/thttpd.c @@ -1519,7 +1697,7 @@ if ( c->bytes_sent >= c->bytes_to_send ) { - /* This conection is finished! */ + /* This connection is finished! */ - clear_connection( c, tvP ); + clear_connection( c, tvP, 1 ); return; |