diff src/http/modules/ngx_http_fastcgi_module.c @ 86:962c43960644 NGINX_0_1_43

nginx 0.1.43 *) Feature: the listen(2) backlog in the "listen" directive can be changed using the -HUP signal. *) Feature: the geo2nginx.pl script was added to contrib. *) Change: the FastCGI parameters with the empty values now are passed to a server. *) Bugfix: the segmentation fault occurred or the worker process may got caught in an endless loop if the proxied or FastCGI server sent the "Cache-Control" header line and the "expires" directive was used; in the proxied mode the bug appeared in 0.1.29.
author Igor Sysoev <http://sysoev.ru>
date Tue, 30 Aug 2005 00:00:00 +0400
parents 9db7e0b5b27f
children 71c46860eb55
line wrap: on
line diff
--- a/src/http/modules/ngx_http_fastcgi_module.c
+++ b/src/http/modules/ngx_http_fastcgi_module.c
@@ -144,15 +144,6 @@ static ngx_http_fastcgi_request_start_t 
 };
 
 
-#if 0
-static ngx_str_t ngx_http_fastcgi_methods[] = {
-    ngx_string("GET"),
-    ngx_string("HEAD"),
-    ngx_string("POST")
-};
-#endif
-
-
 static ngx_str_t  ngx_http_fastcgi_script_name =
     ngx_string("fastcgi_script_name");
 
@@ -428,9 +419,7 @@ ngx_http_fastcgi_create_request(ngx_http
             }
             le.ip += sizeof(uintptr_t);
 
-            if (val_len) {
-                len += 1 + key_len + ((val_len > 127) ? 4 : 1) + val_len;
-            }
+            len += 1 + key_len + ((val_len > 127) ? 4 : 1) + val_len;
         }
     }
 
@@ -527,22 +516,18 @@ ngx_http_fastcgi_create_request(ngx_http
             }
             le.ip += sizeof(uintptr_t);
 
-            if (val_len) {
-                *e.pos++ = (u_char) key_len;
+            *e.pos++ = (u_char) key_len;
 
-                if (val_len > 127) {
-                    *e.pos++ = (u_char) (((val_len >> 24) & 0x7f) | 0x80);
-                    *e.pos++ = (u_char) ((val_len >> 16) & 0xff);
-                    *e.pos++ = (u_char) ((val_len >> 8) & 0xff);
-                    *e.pos++ = (u_char) (val_len & 0xff);
+            if (val_len > 127) {
+                *e.pos++ = (u_char) (((val_len >> 24) & 0x7f) | 0x80);
+                *e.pos++ = (u_char) ((val_len >> 16) & 0xff);
+                *e.pos++ = (u_char) ((val_len >> 8) & 0xff);
+                *e.pos++ = (u_char) (val_len & 0xff);
 
-                } else {
-                    *e.pos++ = (u_char) val_len;
-                }
+            } else {
+                *e.pos++ = (u_char) val_len;
             }
 
-            e.skip = val_len ? 0 : 1;
-
             while (*(uintptr_t *) e.ip) {
                 code = *(ngx_http_script_code_pt *) e.ip;
                 code((ngx_http_script_engine_t *) &e);