X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_object.c;h=1795e37a30f7c29157bc578870f5d869c82c7cf5;hp=310772a7e6b6724f76f0ff1273be35132884a4f7;hb=5d110e80ca7e57b8f5e0a30ce4249e2792755ccd;hpb=39cc1a2cc407bc6ca89829cffd1bfafd463720ca

diff --git a/http_request_object.c b/http_request_object.c
index 310772a..1795e37 100644
--- a/http_request_object.c
+++ b/http_request_object.c
@@ -439,6 +439,10 @@ PHP_MINIT_FUNCTION(http_request_object)
 #	if HTTP_CURL_VERSION(7,15,2)
 	zend_declare_class_constant_long(THIS_CE, ZEND_STRS("PROXY_SOCKS4")-1, CURLPROXY_SOCKS4 TSRMLS_CC);
 #	endif
+#if HTTP_CURL_VERSION(7,18,0)
+	zend_declare_class_constant_long(THIS_CE, ZEND_STRS("PROXY_SOCKS4A")-1, CURLPROXY_SOCKS5 TSRMLS_CC);
+	zend_declare_class_constant_long(THIS_CE, ZEND_STRS("PROXY_SOCKS5_HOSTNAME")-1, CURLPROXY_SOCKS5 TSRMLS_CC);
+#endif
 	zend_declare_class_constant_long(THIS_CE, ZEND_STRS("PROXY_SOCKS5")-1, CURLPROXY_SOCKS5 TSRMLS_CC);
 	zend_declare_class_constant_long(THIS_CE, ZEND_STRS("PROXY_HTTP")-1, CURLPROXY_HTTP TSRMLS_CC);
 #endif /* WONKY */
@@ -745,7 +749,7 @@ STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this
 
 static int apply_pretty_key(void *pDest, int num_args, va_list args, zend_hash_key *hash_key)
 {
-	if (hash_key->nKeyLength > 1) {
+	if (hash_key->arKey && hash_key->nKeyLength > 1) {
 		hash_key->h = zend_hash_func(pretty_key(hash_key->arKey, hash_key->nKeyLength - 1, 1, 0), hash_key->nKeyLength);
 	}
 	return ZEND_HASH_APPLY_KEEP;
@@ -1172,13 +1176,10 @@ PHP_METHOD(HttpRequest, setQueryData)
 		zend_update_property_string(THIS_CE, getThis(), ZEND_STRS("queryData")-1, query_data TSRMLS_CC);
 		efree(query_data);
 	} else {
-		zval *orig = qdata;
+		zval *data = http_zsep(IS_STRING, qdata);
 		
-		convert_to_string_ex(&qdata);
-		zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("queryData")-1, Z_STRVAL_P(qdata), Z_STRLEN_P(qdata) TSRMLS_CC);
-		if (orig != qdata) {
-			zval_ptr_dtor(&qdata);
-		}
+		zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("queryData")-1, Z_STRVAL_P(data), Z_STRLEN_P(data) TSRMLS_CC);
+		zval_ptr_dtor(&data);
 	}
 	RETURN_TRUE;
 }
@@ -1583,10 +1584,9 @@ PHP_METHOD(HttpRequest, getResponseCookies)
 				if (allowed_extras_array) {
 					allowed_extras = ecalloc(zend_hash_num_elements(Z_ARRVAL_P(allowed_extras_array)) + 1, sizeof(char *));
 					FOREACH_VAL(pos, allowed_extras_array, entry) {
-						ZVAL_ADDREF(*entry);
-						convert_to_string_ex(entry);
-						allowed_extras[i++] = estrndup(Z_STRVAL_PP(entry), Z_STRLEN_PP(entry));
-						zval_ptr_dtor(entry);
+						zval *data = http_zsep(IS_STRING, *entry);
+						allowed_extras[i++] = estrndup(Z_STRVAL_P(data), Z_STRLEN_P(data));
+						zval_ptr_dtor(&data);
 					}
 				}
 				
@@ -1598,9 +1598,9 @@ PHP_METHOD(HttpRequest, getResponseCookies)
 							zval **single_header;
 							
 							FOREACH_VAL(pos2, *header, single_header) {
-								ZVAL_ADDREF(*single_header);
-								convert_to_string_ex(single_header);
-								if (http_parse_cookie_ex(&list, Z_STRVAL_PP(single_header), flags, allowed_extras)) {
+								zval *data = http_zsep(IS_STRING, *single_header);
+								
+								if (http_parse_cookie_ex(&list, Z_STRVAL_P(data), flags, allowed_extras)) {
 									zval *cookie;
 									
 									MAKE_STD_ZVAL(cookie);
@@ -1609,12 +1609,11 @@ PHP_METHOD(HttpRequest, getResponseCookies)
 									add_next_index_zval(return_value, cookie);
 									http_cookie_list_dtor(&list);
 								}
-								zval_ptr_dtor(single_header);
+								zval_ptr_dtor(&data);
 							}
 						} else {
-							ZVAL_ADDREF(*header);
-							convert_to_string_ex(header);
-							if (http_parse_cookie_ex(&list, Z_STRVAL_PP(header), flags, allowed_extras)) {
+							zval *data = http_zsep(IS_STRING, *header);
+							if (http_parse_cookie_ex(&list, Z_STRVAL_P(data), flags, allowed_extras)) {
 								zval *cookie;
 								
 								MAKE_STD_ZVAL(cookie);
@@ -1623,7 +1622,7 @@ PHP_METHOD(HttpRequest, getResponseCookies)
 								add_next_index_zval(return_value, cookie);
 								http_cookie_list_dtor(&list);
 							}
-							zval_ptr_dtor(header);
+							zval_ptr_dtor(&data);
 						}
 					}
 				}