This commit is contained in:
Maxim Dounin 2013-07-11 20:38:27 +04:00
parent 4ef36b38a1
commit d10251030a
3 changed files with 3 additions and 3 deletions

View File

@ -4469,7 +4469,7 @@ static ngx_http_method_name_t ngx_methods_names[] = {
{ (u_char *) "COPY", (uint32_t) ~NGX_HTTP_COPY }, { (u_char *) "COPY", (uint32_t) ~NGX_HTTP_COPY },
{ (u_char *) "MOVE", (uint32_t) ~NGX_HTTP_MOVE }, { (u_char *) "MOVE", (uint32_t) ~NGX_HTTP_MOVE },
{ (u_char *) "OPTIONS", (uint32_t) ~NGX_HTTP_OPTIONS }, { (u_char *) "OPTIONS", (uint32_t) ~NGX_HTTP_OPTIONS },
{ (u_char *) "PROPFIND" , (uint32_t) ~NGX_HTTP_PROPFIND }, { (u_char *) "PROPFIND", (uint32_t) ~NGX_HTTP_PROPFIND },
{ (u_char *) "PROPPATCH", (uint32_t) ~NGX_HTTP_PROPPATCH }, { (u_char *) "PROPPATCH", (uint32_t) ~NGX_HTTP_PROPPATCH },
{ (u_char *) "LOCK", (uint32_t) ~NGX_HTTP_LOCK }, { (u_char *) "LOCK", (uint32_t) ~NGX_HTTP_LOCK },
{ (u_char *) "UNLOCK", (uint32_t) ~NGX_HTTP_UNLOCK }, { (u_char *) "UNLOCK", (uint32_t) ~NGX_HTTP_UNLOCK },

View File

@ -465,7 +465,7 @@ ngx_mail_add_addrs(ngx_conf_t *cf, ngx_mail_port_t *mport,
addrs[i].conf.ssl = addr[i].ssl; addrs[i].conf.ssl = addr[i].ssl;
#endif #endif
len = ngx_sock_ntop(addr[i].sockaddr, addr[i].socklen , buf, len = ngx_sock_ntop(addr[i].sockaddr, addr[i].socklen, buf,
NGX_SOCKADDR_STRLEN, 1); NGX_SOCKADDR_STRLEN, 1);
p = ngx_pnalloc(cf->pool, len); p = ngx_pnalloc(cf->pool, len);

View File

@ -536,7 +536,7 @@ ngx_signal_worker_processes(ngx_cycle_t *cycle, int signo)
} }
ngx_log_debug2(NGX_LOG_DEBUG_CORE, cycle->log, 0, ngx_log_debug2(NGX_LOG_DEBUG_CORE, cycle->log, 0,
"kill (%P, %d)" , ngx_processes[i].pid, signo); "kill (%P, %d)", ngx_processes[i].pid, signo);
if (kill(ngx_processes[i].pid, signo) == -1) { if (kill(ngx_processes[i].pid, signo) == -1) {
err = ngx_errno; err = ngx_errno;