r1678, r1679 merge:

*) copy protocol value when large request line is copied,
   this fixes error "fastcgi: the request record is too big"
*) log how big fastcgi record

diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c
index fb2578bf34a15c500747d69d50760f2ac4936db8..df8054466b01ec865ab9430a164aed1c8ca9598d 100644 (file)
--- a/src/http/modules/ngx_http_fastcgi_module.c
+++ b/src/http/modules/ngx_http_fastcgi_module.c
@@ -551,7 +551,7 @@ ngx_http_fastcgi_create_request(ngx_http_request_t *r)
 
     if (len > 65535) {
         ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
-                      "fastcgi: the request record is too big");
+                      "fastcgi request record is too big: %uz", len);
         return NGX_ERROR;
     }
 

diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index 96963a0ab502d8c7261725674905637e5675e548..e5ed1493530fc6592c33e627d3ab838fb05353f9 100644 (file)
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -1151,6 +1151,10 @@ ngx_http_alloc_large_header_buffer(ngx_http_request_t *r,
             r->args_start = new + (r->args_start - old);
         }
 
+        if (r->http_protocol.data) {
+            r->http_protocol.data = new + (r->http_protocol.data - old);
+        }
+
     } else {
         r->header_name_start = new;
         r->header_name_end = new + (r->header_name_end - old);