]> granicus.if.org Git - php/commitdiff
Fixed a bug in apache_request_headers() that adds an extra \0 to header name.
authorGeorge Wang <gwang@php.net>
Thu, 17 Dec 2015 20:20:08 +0000 (15:20 -0500)
committerGeorge Wang <gwang@php.net>
Thu, 17 Dec 2015 20:20:08 +0000 (15:20 -0500)
sapi/litespeed/lsapi_main.c

index 0c9ea49e4b4b8affba5802746cacd303500cdef0..bbdc13df8592fdd697151bc4870a285afd5d0f7d 100644 (file)
@@ -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);
                 }
             }
         }