dmitry          Mon Aug 18 10:48:49 2008 UTC

  Modified files:              
    /php-src/sapi/cgi   cgi_main.c fastcgi.c fastcgi.h 
  Log:
  Fix for bug #45786 (FastCGI process exited unexpectedly)
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.361&r2=1.362&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.361 php-src/sapi/cgi/cgi_main.c:1.362
--- php-src/sapi/cgi/cgi_main.c:1.361   Fri Aug 15 07:31:07 2008
+++ php-src/sapi/cgi/cgi_main.c Mon Aug 18 10:48:49 2008
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: cgi_main.c,v 1.361 2008/08/15 07:31:07 dmitry Exp $ */
+/* $Id: cgi_main.c,v 1.362 2008/08/18 10:48:49 dmitry Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -585,10 +585,10 @@
                ulong idx;
                int filter_arg = (array_ptr == 
PG(http_globals)[TRACK_VARS_ENV])?PARSE_ENV:PARSE_SERVER;
 
-               for (zend_hash_internal_pointer_reset_ex(&request->env, &pos);
-                        zend_hash_get_current_key_ex(&request->env, &var, 
&var_len, &idx, 0, &pos) == HASH_KEY_IS_STRING &&
-                        zend_hash_get_current_data_ex(&request->env, (void **) 
&val, &pos) == SUCCESS;
-                        zend_hash_move_forward_ex(&request->env, &pos)
+               for (zend_hash_internal_pointer_reset_ex(request->env, &pos);
+                        zend_hash_get_current_key_ex(request->env, &var, 
&var_len, &idx, 0, &pos) == HASH_KEY_IS_STRING &&
+                        zend_hash_get_current_data_ex(request->env, (void **) 
&val, &pos) == SUCCESS;
+                        zend_hash_move_forward_ex(request->env, &pos)
                ) {
                        unsigned int new_val_len;
 
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.46&r2=1.47&diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.46 php-src/sapi/cgi/fastcgi.c:1.47
--- php-src/sapi/cgi/fastcgi.c:1.46     Tue Jul 15 13:10:42 2008
+++ php-src/sapi/cgi/fastcgi.c  Mon Aug 18 10:48:49 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: fastcgi.c,v 1.46 2008/07/15 13:10:42 dmitry Exp $ */
+/* $Id: fastcgi.c,v 1.47 2008/08/18 10:48:49 dmitry Exp $ */
 
 #include "php.h"
 #include "fastcgi.h"
@@ -641,7 +641,7 @@
                memcpy(tmp, p, name_len);
                tmp[name_len] = 0;
                s = estrndup((char*)p + name_len, val_len);
-               zend_hash_update(&req->env, tmp, name_len+1, &s, sizeof(char*), 
NULL);
+               zend_hash_update(req->env, tmp, name_len+1, &s, sizeof(char*), 
NULL);
                p += name_len + val_len;
        }
        if (tmp != buf && tmp != NULL) {
@@ -665,7 +665,8 @@
        req->in_len = 0;
        req->out_hdr = NULL;
        req->out_pos = req->out_buf;
-       zend_hash_init(&req->env, 0, NULL, (void (*)(void *)) fcgi_free_var, 0);
+       ALLOC_HASHTABLE(req->env);
+       zend_hash_init(req->env, 0, NULL, (void (*)(void *)) fcgi_free_var, 0);
 
        if (safe_read(req, &hdr, sizeof(fcgi_header)) != sizeof(fcgi_header) ||
            hdr.version < FCGI_VERSION_1) {
@@ -702,15 +703,15 @@
                switch ((((fcgi_begin_request*)buf)->roleB1 << 8) + 
((fcgi_begin_request*)buf)->roleB0) {
                        case FCGI_RESPONDER:
                                val = estrdup("RESPONDER");
-                               zend_hash_update(&req->env, "FCGI_ROLE", 
sizeof("FCGI_ROLE"), &val, sizeof(char*), NULL);
+                               zend_hash_update(req->env, "FCGI_ROLE", 
sizeof("FCGI_ROLE"), &val, sizeof(char*), NULL);
                                break;
                        case FCGI_AUTHORIZER:
                                val = estrdup("AUTHORIZER");
-                               zend_hash_update(&req->env, "FCGI_ROLE", 
sizeof("FCGI_ROLE"), &val, sizeof(char*), NULL);
+                               zend_hash_update(req->env, "FCGI_ROLE", 
sizeof("FCGI_ROLE"), &val, sizeof(char*), NULL);
                                break;
                        case FCGI_FILTER:
                                val = estrdup("FILTER");
-                               zend_hash_update(&req->env, "FCGI_ROLE", 
sizeof("FCGI_ROLE"), &val, sizeof(char*), NULL);
+                               zend_hash_update(req->env, "FCGI_ROLE", 
sizeof("FCGI_ROLE"), &val, sizeof(char*), NULL);
                                break;
                        default:
                                return 0;
@@ -762,7 +763,7 @@
                }
 
                for (j = 0; j < 
sizeof(fcgi_mgmt_vars)/sizeof(fcgi_mgmt_vars[0]); j++) {
-                       if (zend_hash_exists(&req->env, fcgi_mgmt_vars[j].name, 
fcgi_mgmt_vars[j].name_len+1) == 0) {
+                       if (zend_hash_exists(req->env, fcgi_mgmt_vars[j].name, 
fcgi_mgmt_vars[j].name_len+1) == 0) {
                 sprintf((char*)p, "%c%c%s%c", fcgi_mgmt_vars[j].name_len, 1, 
fcgi_mgmt_vars[j].name, fcgi_mgmt_vars[j].val);
                 p += fcgi_mgmt_vars[j].name_len + 3;
                        }
@@ -836,8 +837,10 @@
 
 static inline void fcgi_close(fcgi_request *req, int force, int destroy)
 {
-       if (destroy) {
-               zend_hash_destroy(&req->env);
+       if (destroy && req->env) {
+               zend_hash_destroy(req->env);
+               FREE_HASHTABLE(req->env);
+               req->env = NULL;
        }
 
 #ifdef _WIN32
@@ -1191,7 +1194,7 @@
 
        if (!req) return NULL;
 
-       if (zend_hash_find(&req->env, (char*)var, var_len+1, (void**)&val) == 
SUCCESS) {
+       if (zend_hash_find(req->env, (char*)var, var_len+1, (void**)&val) == 
SUCCESS) {
                return *val;
        }
        return NULL;
@@ -1201,12 +1204,12 @@
 {
        if (var && req) {
                if (val == NULL) {
-                       zend_hash_del(&req->env, var, var_len+1);
+                       zend_hash_del(req->env, var, var_len+1);
                } else {
                        char **ret;
 
                        val = estrdup(val);
-                       if (zend_hash_update(&req->env, var, var_len+1, &val, 
sizeof(char*), (void**)&ret) == SUCCESS) {
+                       if (zend_hash_update(req->env, var, var_len+1, &val, 
sizeof(char*), (void**)&ret) == SUCCESS) {
                                return *ret;
                        }
                }
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/fastcgi.h?r1=1.10&r2=1.11&diff_format=u
Index: php-src/sapi/cgi/fastcgi.h
diff -u php-src/sapi/cgi/fastcgi.h:1.10 php-src/sapi/cgi/fastcgi.h:1.11
--- php-src/sapi/cgi/fastcgi.h:1.10     Mon Dec 31 07:12:19 2007
+++ php-src/sapi/cgi/fastcgi.h  Mon Aug 18 10:48:49 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: fastcgi.h,v 1.10 2007/12/31 07:12:19 sebastian Exp $ */
+/* $Id: fastcgi.h,v 1.11 2008/08/18 10:48:49 dmitry Exp $ */
 
 /* FastCGI protocol */
 
@@ -108,7 +108,7 @@
        unsigned char  out_buf[1024*8];
        unsigned char  reserved[sizeof(fcgi_end_request_rec)];
 
-       HashTable      env;
+       HashTable     *env;
 } fcgi_request;
 
 int fcgi_init(void);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to