Hello Ville, > On 25 Dec 2019, at 10:29, Ville Skyttä <[email protected]> wrote: > > # HG changeset patch > # User Ville Skyttä <[email protected]> > # 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ä <[email protected]> # 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.xml Fri Dec 27 19:43:01 2019 +0300 +++ b/docs/xml/nginx/changes.xml Wed Dec 25 09:24:37 2019 +0200 @@ -14571,7 +14571,7 @@ </para> <para lang="en"> 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. </para> </change> @@ -15333,7 +15333,7 @@ теперь возвращается ошибка 403 вместо 500. </para> <para lang="en"> -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. </para> </change> @@ -15990,7 +15990,7 @@ теперь директива add_header не добавляет пустое значение. </para> <para lang="en"> -now a "add_header" directive does not add an empty value. +now an "add_header" directive does not add an empty value. </para> </change> @@ -17769,7 +17769,7 @@ </para> <para lang="en"> a segmentation fault occurred in worker process, -if big value was used in a "expires" directive.<br/> +if big value was used in an "expires" directive.<br/> Thanks to Joaquin Cuenca Abela. </para> </change> @@ -18443,7 +18443,7 @@ ошибка появилась в 0.6.11. </para> <para lang="en"> -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. </para> @@ -20715,7 +20715,7 @@ директива post_action могла не работать после неудачного завершения запроса. </para> <para lang="en"> -the "post_action" directive might not run after a unsuccessful completion +the "post_action" directive might not run after unsuccessful completion of a request. </para> </change> 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 * 0xCCCCCCCD) >> 35 diff -r f1720934c45b -r 1e5567e2acf9 src/event/modules/ngx_devpoll_module.c --- a/src/event/modules/ngx_devpoll_module.c Fri Dec 27 19:43:01 2019 +0300 +++ b/src/event/modules/ngx_devpoll_module.c Wed 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 */ 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 -r f1720934c45b -r 1e5567e2acf9 src/event/modules/ngx_iocp_module.c --- a/src/event/modules/ngx_iocp_module.c Fri Dec 27 19:43:01 2019 +0300 +++ b/src/event/modules/ngx_iocp_module.c Wed Dec 25 09:24:37 2019 +0200 @@ -62,8 +62,8 @@ NULL, /* delete an event */ NULL, /* enable an event */ NULL, /* disable an event */ - NULL, /* add an connection */ - ngx_iocp_del_connection, /* delete an connection */ + NULL, /* add a connection */ + ngx_iocp_del_connection, /* delete a connection */ NULL, /* trigger a notify */ ngx_iocp_process_events, /* process the events */ ngx_iocp_init, /* init the events */ diff -r f1720934c45b -r 1e5567e2acf9 src/event/modules/ngx_kqueue_module.c --- a/src/event/modules/ngx_kqueue_module.c Fri Dec 27 19:43:01 2019 +0300 +++ b/src/event/modules/ngx_kqueue_module.c Wed Dec 25 09:24:37 2019 +0200 @@ -83,8 +83,8 @@ ngx_kqueue_del_event, /* delete an event */ ngx_kqueue_add_event, /* enable an event */ ngx_kqueue_del_event, /* disable an event */ - NULL, /* add an connection */ - NULL, /* delete an connection */ + NULL, /* add a connection */ + NULL, /* delete a connection */ #ifdef EVFILT_USER ngx_kqueue_notify, /* trigger a notify */ #else diff -r f1720934c45b -r 1e5567e2acf9 src/event/modules/ngx_poll_module.c --- a/src/event/modules/ngx_poll_module.c Fri Dec 27 19:43:01 2019 +0300 +++ b/src/event/modules/ngx_poll_module.c Wed Dec 25 09:24:37 2019 +0200 @@ -37,8 +37,8 @@ ngx_poll_del_event, /* delete an event */ ngx_poll_add_event, /* enable an event */ ngx_poll_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_poll_process_events, /* process the events */ ngx_poll_init, /* init the events */ diff -r f1720934c45b -r 1e5567e2acf9 src/event/modules/ngx_select_module.c --- a/src/event/modules/ngx_select_module.c Fri Dec 27 19:43:01 2019 +0300 +++ b/src/event/modules/ngx_select_module.c Wed Dec 25 09:24:37 2019 +0200 @@ -45,8 +45,8 @@ ngx_select_del_event, /* delete an event */ ngx_select_add_event, /* enable an event */ ngx_select_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_select_process_events, /* process the events */ ngx_select_init, /* init the events */ diff -r f1720934c45b -r 1e5567e2acf9 src/event/modules/ngx_win32_poll_module.c --- a/src/event/modules/ngx_win32_poll_module.c Fri Dec 27 19:43:01 2019 +0300 +++ b/src/event/modules/ngx_win32_poll_module.c Wed Dec 25 09:24:37 2019 +0200 @@ -39,8 +39,8 @@ ngx_poll_del_event, /* delete an event */ ngx_poll_add_event, /* enable an event */ ngx_poll_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_poll_process_events, /* process the events */ ngx_poll_init, /* init the events */ diff -r f1720934c45b -r 1e5567e2acf9 src/event/modules/ngx_win32_select_module.c --- a/src/event/modules/ngx_win32_select_module.c Fri Dec 27 19:43:01 2019 +0300 +++ b/src/event/modules/ngx_win32_select_module.c Wed Dec 25 09:24:37 2019 +0200 @@ -47,8 +47,8 @@ ngx_select_del_event, /* delete an event */ ngx_select_add_event, /* enable an event */ ngx_select_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_select_process_events, /* process the events */ ngx_select_init, /* init the events */ diff -r f1720934c45b -r 1e5567e2acf9 src/http/ngx_http_core_module.c --- a/src/http/ngx_http_core_module.c Fri Dec 27 19:43:01 2019 +0300 +++ b/src/http/ngx_http_core_module.c Wed Dec 25 09:24:37 2019 +0200 @@ -1258,7 +1258,7 @@ & NGX_HTTP_KEEPALIVE_DISABLE_MSIE6)) { /* - * MSIE may wait for some time if an response for + * MSIE may wait for some time if a response for * a POST request was sent over a keepalive connection */ r->keepalive = 0; diff -r f1720934c45b -r 1e5567e2acf9 src/http/ngx_http_parse.c --- a/src/http/ngx_http_parse.c Fri Dec 27 19:43:01 2019 +0300 +++ b/src/http/ngx_http_parse.c Wed Dec 25 09:24:37 2019 +0200 @@ -98,7 +98,7 @@ #endif -/* gcc, icc, msvc and others compile these switches as an jump table */ +/* gcc, icc, msvc and others compile these switches as a jump table */ ngx_int_t ngx_http_parse_request_line(ngx_http_request_t *r, ngx_buf_t *b) diff -r f1720934c45b -r 1e5567e2acf9 src/http/ngx_http_special_response.c --- a/src/http/ngx_http_special_response.c Fri Dec 27 19:43:01 2019 +0300 +++ b/src/http/ngx_http_special_response.c Wed Dec 25 09:24:37 2019 +0200 @@ -253,11 +253,11 @@ static char ngx_http_error_495_page[] = "<html>" CRLF -"<head><title>400 The SSL certificate error</title></head>" +"<head><title>400 SSL certificate error</title></head>" CRLF "<body>" CRLF "<center><h1>400 Bad Request</h1></center>" CRLF -"<center>The SSL certificate error</center>" CRLF +"<center>SSL certificate error</center>" CRLF ; @@ -273,11 +273,11 @@ static char ngx_http_error_497_page[] = "<html>" CRLF -"<head><title>400 The plain HTTP request was sent to HTTPS port</title></head>" +"<head><title>400 Plain HTTP request was sent to HTTPS port</title></head>" CRLF "<body>" CRLF "<center><h1>400 Bad Request</h1></center>" CRLF -"<center>The plain HTTP request was sent to HTTPS port</center>" CRLF +"<center>Plain HTTP request was sent to HTTPS port</center>" CRLF ; diff -r f1720934c45b -r 1e5567e2acf9 src/os/unix/ngx_darwin_sendfile_chain.c --- a/src/os/unix/ngx_darwin_sendfile_chain.c Fri Dec 27 19:43:01 2019 +0300 +++ b/src/os/unix/ngx_darwin_sendfile_chain.c Wed Dec 25 09:24:37 2019 +0200 @@ -54,7 +54,7 @@ if ((ngx_event_flags & NGX_USE_KQUEUE_EVENT) && wev->pending_eof) { (void) ngx_connection_error(c, wev->kq_errno, - "kevent() reported about an closed connection"); + "kevent() reported about a closed connection"); wev->error = 1; return NGX_CHAIN_ERROR; } diff -r f1720934c45b -r 1e5567e2acf9 src/os/unix/ngx_freebsd_sendfile_chain.c --- a/src/os/unix/ngx_freebsd_sendfile_chain.c Fri Dec 27 19:43:01 2019 +0300 +++ b/src/os/unix/ngx_freebsd_sendfile_chain.c Wed Dec 25 09:24:37 2019 +0200 @@ -60,7 +60,7 @@ if ((ngx_event_flags & NGX_USE_KQUEUE_EVENT) && wev->pending_eof) { (void) ngx_connection_error(c, wev->kq_errno, - "kevent() reported about an closed connection"); + "kevent() reported about a closed connection"); wev->error = 1; return NGX_CHAIN_ERROR; } diff -r f1720934c45b -r 1e5567e2acf9 src/os/unix/ngx_readv_chain.c --- a/src/os/unix/ngx_readv_chain.c Fri Dec 27 19:43:01 2019 +0300 +++ b/src/os/unix/ngx_readv_chain.c Wed Dec 25 09:24:37 2019 +0200 @@ -35,7 +35,7 @@ rev->eof = 1; ngx_log_error(NGX_LOG_INFO, c->log, rev->kq_errno, - "kevent() reported about an closed connection"); + "kevent() reported about a closed connection"); if (rev->kq_errno) { rev->error = 1; diff -r f1720934c45b -r 1e5567e2acf9 src/os/unix/ngx_recv.c --- a/src/os/unix/ngx_recv.c Fri Dec 27 19:43:01 2019 +0300 +++ b/src/os/unix/ngx_recv.c Wed Dec 25 09:24:37 2019 +0200 @@ -36,7 +36,7 @@ ngx_set_socket_errno(rev->kq_errno); return ngx_connection_error(c, rev->kq_errno, - "kevent() reported about an closed connection"); + "kevent() reported about a closed connection"); } return 0; diff -r f1720934c45b -r 1e5567e2acf9 src/os/unix/ngx_send.c --- a/src/os/unix/ngx_send.c Fri Dec 27 19:43:01 2019 +0300 +++ b/src/os/unix/ngx_send.c Wed Dec 25 09:24:37 2019 +0200 @@ -23,7 +23,7 @@ if ((ngx_event_flags & NGX_USE_KQUEUE_EVENT) && wev->pending_eof) { (void) ngx_connection_error(c, wev->kq_errno, - "kevent() reported about an closed connection"); + "kevent() reported about a closed connection"); wev->error = 1; return NGX_ERROR; } diff -r f1720934c45b -r 1e5567e2acf9 src/os/unix/ngx_udp_sendmsg_chain.c --- a/src/os/unix/ngx_udp_sendmsg_chain.c Fri Dec 27 19:43:01 2019 +0300 +++ b/src/os/unix/ngx_udp_sendmsg_chain.c Wed Dec 25 09:24:37 2019 +0200 @@ -35,7 +35,7 @@ if ((ngx_event_flags & NGX_USE_KQUEUE_EVENT) && wev->pending_eof) { (void) ngx_connection_error(c, wev->kq_errno, - "kevent() reported about an closed connection"); + "kevent() reported about a closed connection"); wev->error = 1; return NGX_CHAIN_ERROR; } diff -r f1720934c45b -r 1e5567e2acf9 src/os/unix/ngx_writev_chain.c --- a/src/os/unix/ngx_writev_chain.c Fri Dec 27 19:43:01 2019 +0300 +++ b/src/os/unix/ngx_writev_chain.c Wed Dec 25 09:24:37 2019 +0200 @@ -30,7 +30,7 @@ if ((ngx_event_flags & NGX_USE_KQUEUE_EVENT) && wev->pending_eof) { (void) ngx_connection_error(c, wev->kq_errno, - "kevent() reported about an closed connection"); + "kevent() reported about a closed connection"); wev->error = 1; return NGX_CHAIN_ERROR; } […] Best regards, yar _______________________________________________ nginx-devel mailing list [email protected] http://mailman.nginx.org/mailman/listinfo/nginx-devel
