com php-src: fix build: Zend/zend_constants.c sapi/cgi/fa stcgi.c

From: Date: Wed, 16 Oct 2013 10:09:49 +0000
Subject: com php-src: fix build: Zend/zend_constants.c sapi/cgi/fa stcgi.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-73478@lists.php.net to get a copy of this message
Commit: 832e9653d1a779766a40273385ee638e8f23e3c2 Author: Anatol Belski <ab@php.net> Thu, 22 Aug 2013 03:59:09 -0700 Parents: 469b9e44fb9f0c2871b041beae3c8ea744ab4af3 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=832e9653d1a779766a40273385ee638e8f23e3c2 Log: fix build Changed paths: M Zend/zend_constants.c M sapi/cgi/fastcgi.c Diff: diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c index 5feec9d..dd76472 100644 --- a/Zend/zend_constants.c +++ b/Zend/zend_constants.c @@ -143,7 +143,7 @@ void clean_non_persistent_constants(TSRMLS_D) } } -ZEND_API void zend_register_null_constant(const char *name, uint name_len, int flags, int module_number TSRMLS_DC) +ZEND_API void zend_register_null_constant(const char *name, zend_str_size_uint name_len, int flags, int module_number TSRMLS_DC) { zend_constant c; @@ -155,7 +155,7 @@ ZEND_API void zend_register_null_constant(const char *name, uint name_len, int f zend_register_constant(&c TSRMLS_CC); } -ZEND_API void zend_register_bool_constant(const char *name, uint name_len, zend_bool bval, int flags, int module_number TSRMLS_DC) +ZEND_API void zend_register_bool_constant(const char *name, zend_str_size_uint name_len, zend_bool bval, int flags, int module_number TSRMLS_DC) { zend_constant c; diff --git a/sapi/cgi/fastcgi.c b/sapi/cgi/fastcgi.c index 72977b6..296c170 100644 --- a/sapi/cgi/fastcgi.c +++ b/sapi/cgi/fastcgi.c @@ -992,7 +992,7 @@ static int fcgi_read_request(fcgi_request *req) if (zend_hash_find(&fcgi_mgmt_vars, q->var, q->var_len, (void**) &value) != SUCCESS) { continue; } - zlen = Z_STRLEN_PP(value); + zlen = Z_STRSIZE_PP(value); if ((p + 4 + 4 + q->var_len + zlen) >= (buf + sizeof(buf))) { break; } @@ -1514,7 +1514,7 @@ void fcgi_set_mgmt_var(const char * name, size_t name_len, const char * value, s zvalue = pemalloc(sizeof(*zvalue), 1); Z_TYPE_P(zvalue) = IS_STRING; Z_STRVAL_P(zvalue) = pestrndup(value, value_len, 1); - Z_STRLEN_P(zvalue) = value_len; + Z_STRSIZE_P(zvalue) = value_len; zend_hash_add(&fcgi_mgmt_vars, name, name_len, &zvalue, sizeof(zvalue), NULL); }

« previous php.cvs (#73478) next »