summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Wang <gwang@php.net>2015-12-17 15:20:08 -0500
committerGeorge Wang <gwang@php.net>2015-12-17 15:20:08 -0500
commit0a1a4dc033aca454c6d9a3668b5d0e5bb5ec367e (patch)
tree2d4b3bd1d9a649e72d30659470cced5084241ac3
parenta3e19527004dc67dfd875e758007b8ae135d4ed1 (diff)
downloadphp-git-0a1a4dc033aca454c6d9a3668b5d0e5bb5ec367e.tar.gz
Fixed a bug in apache_request_headers() that adds an extra \0 to header name.
-rw-r--r--sapi/litespeed/lsapi_main.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c
index 0c9ea49e4b..bbdc13df85 100644
--- a/sapi/litespeed/lsapi_main.c
+++ b/sapi/litespeed/lsapi_main.c
@@ -1170,11 +1170,7 @@ zend_module_entry litespeed_module_entry = {
static int add_associate_array( const char * pKey, int keyLen, const char * pValue, int valLen,
void * arg )
{
- add_assoc_string_ex( (zval *)arg, (char *)pKey, keyLen+1, (char *)pValue
-#if PHP_MAJOR_VERSION < 7
- , 1
-#endif
- );
+ add_assoc_string_ex((zval *)arg, (char *)pKey, keyLen, (char *)pValue);
return 1;
}
@@ -1228,11 +1224,7 @@ PHP_FUNCTION(litespeed_response_headers)
headerBuf[len] = 0;
if ( len ) {
while( isspace(*++p));
- add_assoc_string_ex(return_value, headerBuf, len+1, p
-#if PHP_MAJOR_VERSION < 7
- , 1
-#endif
- );
+ add_assoc_string_ex(return_value, headerBuf, len, p);
}
}
}