optimization

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 4277ed05cc34e8207ac0ae20e6e7d4bdddba3fe1..257e6fcbb44b4492c1b34f69a6e678c0064c10d5 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -756,7 +756,17 @@ static int sapi_cgi_deactivate(TSRMLS_D)
                2. When the first call occurs and the request is not set up, flush fails on FastCGI.
        */
        if (SG(sapi_started)) {
-               sapi_cgibin_flush(SG(server_context));
+               if (fcgi_is_fastcgi()) {
+                       if (
+#ifndef PHP_WIN32
+                               !parent &&
+#endif
+                               !fcgi_finish_request((fcgi_request*)SG(server_context))) {
+                               php_handle_aborted_connection();
+                       }
+               } else {
+                       sapi_cgibin_flush(SG(server_context));
+               }
        }
        return SUCCESS;
 }

diff --git a/sapi/cgi/fastcgi.c b/sapi/cgi/fastcgi.c
index 9d77474b741c5ea14b5a52393a382284f1816945..ceb5edea9e08c54096295869c4b8fa772a2f3d4e 100644 (file)
--- a/sapi/cgi/fastcgi.c
+++ b/sapi/cgi/fastcgi.c
@@ -632,7 +632,7 @@ static int fcgi_get_params(fcgi_request *req, unsigned char *p, unsigned char *e
                }
                memcpy(tmp, p, name_len);
                tmp[name_len] = 0;
-               s = zend_strndup((char*)p + name_len, val_len);
+               s = estrndup((char*)p + name_len, val_len);
                zend_hash_update(&req->env, tmp, name_len+1, &s, sizeof(char*), NULL);
                p += name_len + val_len;
        }
@@ -644,7 +644,7 @@ static int fcgi_get_params(fcgi_request *req, unsigned char *p, unsigned char *e
 
 static void fcgi_free_var(char **s)
 {
-       free(*s);
+       efree(*s);
 }
 
 static int fcgi_read_request(fcgi_request *req)
@@ -657,7 +657,7 @@ static int fcgi_read_request(fcgi_request *req)
        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, 1);
+       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) {
@@ -693,15 +693,15 @@ static int fcgi_read_request(fcgi_request *req)
                req->keep = (((fcgi_begin_request*)buf)->flags & FCGI_KEEP_CONN);
                switch ((((fcgi_begin_request*)buf)->roleB1 << 8) + ((fcgi_begin_request*)buf)->roleB0) {
                        case FCGI_RESPONDER:
-                               val = strdup("RESPONDER");
+                               val = estrdup("RESPONDER");
                                zend_hash_update(&req->env, "FCGI_ROLE", sizeof("FCGI_ROLE"), &val, sizeof(char*), NULL);
                                break;
                        case FCGI_AUTHORIZER:
-                               val = strdup("AUTHORIZER");
+                               val = estrdup("AUTHORIZER");
                                zend_hash_update(&req->env, "FCGI_ROLE", sizeof("FCGI_ROLE"), &val, sizeof(char*), NULL);
                                break;
                        case FCGI_FILTER:
-                               val = strdup("FILTER");
+                               val = estrdup("FILTER");
                                zend_hash_update(&req->env, "FCGI_ROLE", sizeof("FCGI_ROLE"), &val, sizeof(char*), NULL);
                                break;
                        default:
@@ -1168,11 +1168,13 @@ int fcgi_write(fcgi_request *req, fcgi_request_type type, const char *str, int l
 
 int fcgi_finish_request(fcgi_request *req)
 {
+       int ret = 1;
+
        if (req->fd >= 0) {
-               fcgi_flush(req, 1);
+               ret = fcgi_flush(req, 1);
                fcgi_close(req, 0, 1);
        }
-       return 1;
+       return ret;
 }
 
 char* fcgi_getenv(fcgi_request *req, const char* var, int var_len)
@@ -1195,7 +1197,7 @@ char* fcgi_putenv(fcgi_request *req, char* var, int var_len, char* val)
                } else {
                        char **ret;
 
-                       val = strdup(val);
+                       val = estrdup(val);
                        if (zend_hash_update(&req->env, var, var_len+1, &val, sizeof(char*), (void**)&ret) == SUCCESS) {
                                return *ret;
                        }