nginx-0.0.1-2004-01-19-00:09:21 import
diff --git a/src/core/ngx_log.c b/src/core/ngx_log.c
index 12c59f5..5e3df22 100644
--- a/src/core/ngx_log.c
+++ b/src/core/ngx_log.c
@@ -1,15 +1,4 @@
-/*
- TODO: log pid and tid
-*/
-
-/*
- "[time as ctime()] [alert] 412#3 (32)Broken pipe: anything"
-
- "[time as ctime()] [alert] (32)Broken pipe: anything"
- "[time as ctime()] [alert] anything"
-*/
-
#include <ngx_config.h>
#include <ngx_core.h>
@@ -87,7 +76,7 @@
/* pid#tid */
len += ngx_snprintf(errstr + len, sizeof(errstr) - len - 1,
- PID_T_FMT "#%d: ", ngx_getpid(), 0);
+ PID_T_FMT "#%d: ", ngx_getpid(), /* STUB */ 0);
if (log->data) {
len += ngx_snprintf(errstr + len, sizeof(errstr) - len - 1,
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index f685bf3..256a41a 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -391,7 +391,7 @@
/*
* if the large client headers are enabled then
- * we need to copy a request line
+ * we need to copy the request line
*/
r->request_line.data = ngx_palloc(r->pool, r->request_line.len + 1);
@@ -493,8 +493,10 @@
r->request_line.len = p - r->request_start;
r->request_line.data = r->request_start;
- ngx_http_client_error(r, rc, NGX_HTTP_BAD_REQUEST);
-
+ ngx_http_client_error(r, rc,
+ (rc == NGX_HTTP_PARSE_INVALID_METHOD) ?
+ NGX_HTTP_NOT_IMPLEMENTED:
+ NGX_HTTP_BAD_REQUEST);
return;
}
@@ -1179,7 +1181,7 @@
/*
* Pipelined request.
*
- * We do not know here whether a pipelined request is complete
+ * We do not know here whether the pipelined request is complete
* so if the large client headers are not enabled
* we need to copy the data to the start of c->buffer.
* This copy should be rare because clients that support
diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h
index 5b396b1..657a098 100644
--- a/src/http/ngx_http_request.h
+++ b/src/http/ngx_http_request.h
@@ -50,10 +50,10 @@
#define NGX_HTTP_RANGE_NOT_SATISFIABLE 416
/*
- * HTTP does not define a code for the case when a client closed a connection
- * while we are processing request so we introduce own code to log such
- * situation when client has closed a connection before we even try to
- * send HTTP header to it
+ * HTTP does not define the code for the case when a client closed
+ * the connection while we are processing its request so we introduce
+ * own code to log such situation when a client has closed the connection
+ * before we even try to send the HTTP header to it
*/
#define NGX_HTTP_CLIENT_CLOSED_REQUEST 499
