Re: [PATCH] Grammar fixes
Hello Ville, > On 25 Dec 2019, at 10:29, Ville Skyttä wrote: > > # HG changeset patch > # User Ville Skyttä > # Date 1577258677 -7200 > # Wed Dec 25 09:24:37 2019 +0200 > # Node ID f4b83914e4009fb9c528f0318287a76aa0c7326f > # Parent e99e9b0a8c51d59c7ee665489949d8556565adff > Grammar fixes. Thank you for the patch. I've added some minor changes to it (e.g. articles in error messages), please see if the updated patch looks good to you: # HG changeset patch # User Ville Skyttä # Date 1577258677 -7200 # Wed Dec 25 09:24:37 2019 +0200 # Node ID 1e5567e2acf9357c9218216cb3a8b1c83978d7e4 # Parent f1720934c45be1c6469841a55d1f31fe9a630c85 Grammar fixes. diff -r f1720934c45b -r 1e5567e2acf9 docs/xml/nginx/changes.xml --- a/docs/xml/nginx/changes.xmlFri Dec 27 19:43:01 2019 +0300 +++ b/docs/xml/nginx/changes.xmlWed Dec 25 09:24:37 2019 +0200 @@ -14571,7 +14571,7 @@ a segmentation fault might occur in worker process, -if an "debug_connection" directive was used; +if a "debug_connection" directive was used; the bug had appeared in 0.7.54. @@ -15333,7 +15333,7 @@ теперь возвращается ошибка 403 вместо 500. -now if a file specified in a "auth_basic_user_file" directive is absent, +now if a file specified in an "auth_basic_user_file" directive is absent, then the 403 error is returned instead of the 500 one. @@ -15990,7 +15990,7 @@ теперь директива add_header не добавляет пустое значение. -now a "add_header" directive does not add an empty value. +now an "add_header" directive does not add an empty value. @@ -17769,7 +17769,7 @@ a segmentation fault occurred in worker process, -if big value was used in a "expires" directive. +if big value was used in an "expires" directive. Thanks to Joaquin Cuenca Abela. @@ -18443,7 +18443,7 @@ ошибка появилась в 0.6.11. -if the "?" character was in a "error_page" directive, then it was escaped +if the "?" character was in an "error_page" directive, then it was escaped in a proxied request; the bug had appeared in 0.6.11. @@ -20715,7 +20715,7 @@ директива post_action могла не работать после неудачного завершения запроса. -the "post_action" directive might not run after a unsuccessful completion +the "post_action" directive might not run after unsuccessful completion of a request. diff -r f1720934c45b -r 1e5567e2acf9 src/core/ngx_string.c --- a/src/core/ngx_string.c Fri Dec 27 19:43:01 2019 +0300 +++ b/src/core/ngx_string.c Wed Dec 25 09:24:37 2019 +0200 @@ -519,7 +519,7 @@ * The glibc counterpart is about 150 lines of the code. * * For 32-bit numbers and some divisors gcc and icc use - * a inlined multiplication and shifts. For example, + * inlined multiplication and shifts. For example, * unsigned "i32 / 10" is compiled to * * (i32 * 0xCCCD) >> 35 diff -r f1720934c45b -r 1e5567e2acf9 src/event/modules/ngx_devpoll_module.c --- a/src/event/modules/ngx_devpoll_module.cFri Dec 27 19:43:01 2019 +0300 +++ b/src/event/modules/ngx_devpoll_module.cWed Dec 25 09:24:37 2019 +0200 @@ -88,8 +88,8 @@ ngx_devpoll_del_event, /* delete an event */ ngx_devpoll_add_event, /* enable an event */ ngx_devpoll_del_event, /* disable an event */ -NULL, /* add an connection */ -NULL, /* delete an connection */ +NULL, /* add a connection */ +NULL, /* delete a connection */ NULL, /* trigger a notify */ ngx_devpoll_process_events,/* process the events */ ngx_devpoll_init, /* init the events */ diff -r f1720934c45b -r 1e5567e2acf9 src/event/modules/ngx_epoll_module.c --- a/src/event/modules/ngx_epoll_module.c Fri Dec 27 19:43:01 2019 +0300 +++ b/src/event/modules/ngx_epoll_module.c Wed Dec 25 09:24:37 2019 +0200 @@ -186,8 +186,8 @@ ngx_epoll_del_event, /* delete an event */ ngx_epoll_add_event, /* enable an event */ ngx_epoll_del_event, /* disable an event */ -ngx_epoll_add_connection,/* add an connection */ -ngx_epoll_del_connection,/* delete an connection */ +ngx_epoll_add_connection,/* add a connection */ +ngx_epoll_del_connection,/* delete a connection */ #if (NGX_HAVE_EVENTFD) ngx_epoll_notify,/* trigger a notify */ #else diff -r f1720934c45b -r 1e5567e2acf9 src/event/modules/ngx_eventport_module.c --- a/src/event/modules/ngx_eventport_module.c Fri Dec 27 19:43:01 2019 +0300 +++ b/src/event/modules/ngx_eventport_module.c Wed Dec 25 09:24:37 2019 +0200 @@ -181,8 +181,8 @@ ngx_eventport_del_event, /* delete an event */
[PATCH] Grammar fixes
# HG changeset patch # User Ville Skyttä # Date 1577258677 -7200 # Wed Dec 25 09:24:37 2019 +0200 # Node ID f4b83914e4009fb9c528f0318287a76aa0c7326f # Parent e99e9b0a8c51d59c7ee665489949d8556565adff Grammar fixes. diff --git a/docs/xml/nginx/changes.xml b/docs/xml/nginx/changes.xml --- a/docs/xml/nginx/changes.xml +++ b/docs/xml/nginx/changes.xml @@ -14571,7 +14571,7 @@ a segmentation fault might occur in worker process, -if an "debug_connection" directive was used; +if a "debug_connection" directive was used; the bug had appeared in 0.7.54. @@ -15333,7 +15333,7 @@ теперь возвращается ошибка 403 вместо 500. -now if a file specified in a "auth_basic_user_file" directive is absent, +now if a file specified in an "auth_basic_user_file" directive is absent, then the 403 error is returned instead of the 500 one. @@ -15990,7 +15990,7 @@ теперь директива add_header не добавляет пустое значение. -now a "add_header" directive does not add an empty value. +now an "add_header" directive does not add an empty value. @@ -17769,7 +17769,7 @@ a segmentation fault occurred in worker process, -if big value was used in a "expires" directive. +if big value was used in an "expires" directive. Thanks to Joaquin Cuenca Abela. @@ -18443,7 +18443,7 @@ ошибка появилась в 0.6.11. -if the "?" character was in a "error_page" directive, then it was escaped +if the "?" character was in an "error_page" directive, then it was escape in a proxied request; the bug had appeared in 0.6.11. @@ -20715,7 +20715,7 @@ директива post_action могла не работать после неудачного завершения запроса. -the "post_action" directive might not run after a unsuccessful completion +the "post_action" directive might not run after an unsuccessful completion of a request. diff --git a/src/core/ngx_string.c b/src/core/ngx_string.c --- a/src/core/ngx_string.c +++ b/src/core/ngx_string.c @@ -519,7 +519,7 @@ * The glibc counterpart is about 150 lines of the code. * * For 32-bit numbers and some divisors gcc and icc use - * a inlined multiplication and shifts. For example, + * inlined multiplication and shifts. For example, * unsigned "i32 / 10" is compiled to * * (i32 * 0xCCCD) >> 35 diff --git a/src/event/modules/ngx_devpoll_module.c b/src/event/modules/ngx_devpoll_module.c --- a/src/event/modules/ngx_devpoll_module.c +++ b/src/event/modules/ngx_devpoll_module.c @@ -88,8 +88,8 @@ ngx_devpoll_del_event, /* delete an event */ ngx_devpoll_add_event, /* enable an event */ ngx_devpoll_del_event, /* disable an event */ -NULL, /* add an connection */ -NULL, /* delete an connection */ +NULL, /* add a connection */ +NULL, /* delete a connection */ NULL, /* trigger a notify */ ngx_devpoll_process_events,/* process the events */ ngx_devpoll_init, /* init the events */ diff --git a/src/event/modules/ngx_epoll_module.c b/src/event/modules/ngx_epoll_module.c --- a/src/event/modules/ngx_epoll_module.c +++ b/src/event/modules/ngx_epoll_module.c @@ -186,8 +186,8 @@ ngx_epoll_del_event, /* delete an event */ ngx_epoll_add_event, /* enable an event */ ngx_epoll_del_event, /* disable an event */ -ngx_epoll_add_connection,/* add an connection */ -ngx_epoll_del_connection,/* delete an connection */ +ngx_epoll_add_connection,/* add a connection */ +ngx_epoll_del_connection,/* delete a connection */ #if (NGX_HAVE_EVENTFD) ngx_epoll_notify,/* trigger a notify */ #else diff --git a/src/event/modules/ngx_eventport_module.c b/src/event/modules/ngx_eventport_module.c --- a/src/event/modules/ngx_eventport_module.c +++ b/src/event/modules/ngx_eventport_module.c @@ -181,8 +181,8 @@ ngx_eventport_del_event, /* delete an event */ ngx_eventport_add_event, /* enable an event */ ngx_eventport_del_event, /* disable an event */ -NULL, /* add an connection */ -NULL, /* delete an connection */ +NULL, /* add a connection */ +NULL, /* delete a connection */ ngx_eventport_notify, /* trigger a notify */ ngx_eventport_process_events, /* process the events */ ngx_eventport_init,/* init the events */ diff --git a/src/event/modules/ngx_iocp_module.c b/src/event/modules/ngx_iocp_module.c --- a/src/event/modules/ngx_iocp_module.c
