X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_object.c;h=09c43a56ae1a527ef59df29fe07057930e601f79;hp=c72d90818e7dfeb5b29d3d65f67352c67ea3f585;hb=b1ace11a9604ffcc496d32827aa66a2ba99db5ff;hpb=a0414c8466220308c14e57abe15e66e0e17b7108

diff --git a/http_request_object.c b/http_request_object.c
index c72d908..09c43a5 100644
--- a/http_request_object.c
+++ b/http_request_object.c
@@ -429,6 +429,9 @@ PHP_MINIT_FUNCTION(http_request_object)
 	*/
 	zend_declare_class_constant_long(THIS_CE, ZEND_STRS("AUTH_BASIC")-1, CURLAUTH_BASIC TSRMLS_CC);
 	zend_declare_class_constant_long(THIS_CE, ZEND_STRS("AUTH_DIGEST")-1, CURLAUTH_DIGEST TSRMLS_CC);
+#if HTTP_CURL_VERSION(7,19,3)
+	zend_declare_class_constant_long(THIS_CE, ZEND_STRS("AUTH_DIGEST_IE")-1, CURLAUTH_DIGEST_IE TSRMLS_CC);
+#endif
 	zend_declare_class_constant_long(THIS_CE, ZEND_STRS("AUTH_NTLM")-1, CURLAUTH_NTLM TSRMLS_CC);
 	zend_declare_class_constant_long(THIS_CE, ZEND_STRS("AUTH_GSSNEG")-1, CURLAUTH_GSSNEGOTIATE TSRMLS_CC);
 	zend_declare_class_constant_long(THIS_CE, ZEND_STRS("AUTH_ANY")-1, CURLAUTH_ANY TSRMLS_CC);
@@ -445,6 +448,9 @@ PHP_MINIT_FUNCTION(http_request_object)
 #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);
+#	if HTTP_CURL_VERSION(7,19,4)
+	zend_declare_class_constant_long(THIS_CE, ZEND_STRS("PROXY_HTTP_1_0")-1, CURLPROXY_HTTP_1_0 TSRMLS_CC);
+#	endif
 #endif /* WONKY */
 	
 	return SUCCESS;
@@ -1176,13 +1182,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;
 }
@@ -1317,14 +1320,14 @@ PHP_METHOD(HttpRequest, addBody)
 	}
 	
 	if (data_len) {
-		zval *data = zend_read_property(THIS_CE, getThis(), ZEND_STRS("rrequestBody")-1, 0 TSRMLS_CC);
+		zval *data = zend_read_property(THIS_CE, getThis(), ZEND_STRS("requestBody")-1, 0 TSRMLS_CC);
 		
 		if (Z_STRLEN_P(data)) {
 			Z_STRVAL_P(data) = erealloc(Z_STRVAL_P(data), (Z_STRLEN_P(data) += data_len) + 1);
 			Z_STRVAL_P(data)[Z_STRLEN_P(data)] = '\0';
 			memcpy(Z_STRVAL_P(data) + Z_STRLEN_P(data) - data_len, raw_data, data_len);
 		} else {
-			zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("putData")-1, raw_data, data_len TSRMLS_CC);
+			zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("requestBody")-1, raw_data, data_len TSRMLS_CC);
 		}
 	}
 	
@@ -1587,10 +1590,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);
 					}
 				}
 				
@@ -1602,9 +1604,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);
@@ -1613,12 +1615,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);
@@ -1627,7 +1628,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);
 						}
 					}
 				}