dmitry Mon, 05 Jul 2010 15:40:54 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=301003
Log:
reduced request processing overhead
Changed paths:
U php/php-src/trunk/sapi/cgi/cgi_main.c
U php/php-src/trunk/sapi/cgi/fastcgi.c
U php/php-src/trunk/sapi/cgi/fastcgi.h
Modified: php/php-src/trunk/sapi/cgi/cgi_main.c
===================================================================
--- php/php-src/trunk/sapi/cgi/cgi_main.c 2010-07-05 14:32:29 UTC (rev
301002)
+++ php/php-src/trunk/sapi/cgi/cgi_main.c 2010-07-05 15:40:54 UTC (rev
301003)
@@ -625,10 +625,10 @@
/* turn off magic_quotes while importing environment variables
*/
PG(magic_quotes_gpc) = 0;
- 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;
Modified: php/php-src/trunk/sapi/cgi/fastcgi.c
===================================================================
--- php/php-src/trunk/sapi/cgi/fastcgi.c 2010-07-05 14:32:29 UTC (rev
301002)
+++ php/php-src/trunk/sapi/cgi/fastcgi.c 2010-07-05 15:40:54 UTC (rev
301003)
@@ -638,7 +638,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) {
@@ -663,8 +663,8 @@
req->in_len = 0;
req->out_hdr = NULL;
req->out_pos = req->out_buf;
- ALLOC_HASHTABLE(req->env);
- zend_hash_init(req->env, 0, NULL, (void (*)(void *)) fcgi_free_var, 0);
+ req->has_env = 1;
+ zend_hash_init(&req->env, 32, NULL, (void (*)(void *)) fcgi_free_var,
0);
if (safe_read(req, &hdr, sizeof(fcgi_header)) != sizeof(fcgi_header) ||
hdr.version < FCGI_VERSION_1) {
@@ -700,16 +700,16 @@
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 = estrdup("RESPONDER");
- zend_hash_update(req->env, "FCGI_ROLE",
sizeof("FCGI_ROLE"), &val, sizeof(char*), NULL);
+ val = estrndup("RESPONDER",
sizeof("RESPONDER")-1);
+ 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);
+ val = estrndup("AUTHORIZER",
sizeof("AUTHORIZER")-1);
+ 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);
+ val = estrndup("FILTER", sizeof("FILTER")-1);
+ zend_hash_update(&req->env, "FCGI_ROLE",
sizeof("FCGI_ROLE"), &val, sizeof(char*), NULL);
break;
default:
return 0;
@@ -765,10 +765,10 @@
return 0;
}
- zend_hash_internal_pointer_reset_ex(req->env, &pos);
- while ((key_type = zend_hash_get_current_key_ex(req->env,
&str_index, &str_length, &num_index, 0, &pos)) != HASH_KEY_NON_EXISTANT) {
+ zend_hash_internal_pointer_reset_ex(&req->env, &pos);
+ while ((key_type = zend_hash_get_current_key_ex(&req->env,
&str_index, &str_length, &num_index, 0, &pos)) != HASH_KEY_NON_EXISTANT) {
int zlen;
- zend_hash_move_forward_ex(req->env, &pos);
+ zend_hash_move_forward_ex(&req->env, &pos);
if (key_type != HASH_KEY_IS_STRING) {
continue;
}
@@ -870,10 +870,9 @@
static inline void fcgi_close(fcgi_request *req, int force, int destroy)
{
- if (destroy && req->env) {
- zend_hash_destroy(req->env);
- FREE_HASHTABLE(req->env);
- req->env = NULL;
+ if (destroy && req->has_env) {
+ zend_hash_destroy(&req->env);
+ req->has_env = 0;
}
#ifdef _WIN32
@@ -1229,7 +1228,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;
@@ -1239,12 +1238,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;
}
}
Modified: php/php-src/trunk/sapi/cgi/fastcgi.h
===================================================================
--- php/php-src/trunk/sapi/cgi/fastcgi.h 2010-07-05 14:32:29 UTC (rev
301002)
+++ php/php-src/trunk/sapi/cgi/fastcgi.h 2010-07-05 15:40:54 UTC (rev
301003)
@@ -109,7 +109,8 @@
unsigned char out_buf[1024*8];
unsigned char reserved[sizeof(fcgi_end_request_rec)];
- HashTable *env;
+ int has_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
