X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_request.c;h=ea4d4dd39de76b5108c8e118cebae5fc56c82e7e;hp=857beea978dfc66014bd507b5ad3719848aa1afb;hb=aacbe6aa75ca07853bf88d5b3647f67f107d1af7;hpb=e76f27074a23b1cf83fdd81f97a5c767399225a6

diff --git a/php_http_request.c b/php_http_request.c
index 857beea..ea4d4dd 100644
--- a/php_http_request.c
+++ b/php_http_request.c
@@ -6,18 +6,13 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: php_http_request_api.c 298591 2010-04-26 11:46:55Z mike $ */
-
-#include "php_http.h"
+#include "php_http_api.h"
 
 #include <ext/spl/spl_observer.h>
-#include <ext/spl/spl_iterators.h>
-#include <Zend/zend_interfaces.h>
-
 
 PHP_HTTP_API php_http_request_t *php_http_request_init(php_http_request_t *h, php_http_request_ops_t *ops, php_http_resource_factory_t *rf, void *init_arg TSRMLS_DC)
 {
@@ -549,6 +544,7 @@ STATUS php_http_request_object_responsehandler(php_http_request_object_t *obj, z
 static int apply_pretty_key(void *pDest TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key)
 {
 	if (hash_key->arKey && hash_key->nKeyLength > 1) {
+		/* FIXME: this seems evil */
 		hash_key->h = zend_hash_func(php_http_pretty_key(hash_key->arKey, hash_key->nKeyLength - 1, 1, 0), hash_key->nKeyLength);
 	}
 	return ZEND_HASH_APPLY_KEEP;
@@ -566,7 +562,7 @@ static inline void php_http_request_object_set_options_subr(INTERNAL_FUNCTION_PA
 			array_copy(Z_ARRVAL_P(old_opts), Z_ARRVAL_P(new_opts));
 		}
 
-		if (SUCCESS == zend_hash_find(Z_ARRVAL_P(new_opts), key, len, (void *) &entry)) {
+		if (SUCCESS == zend_symtable_find(Z_ARRVAL_P(new_opts), key, len, (void *) &entry)) {
 			if (overwrite) {
 				zend_hash_clean(Z_ARRVAL_PP(entry));
 			}
@@ -600,7 +596,7 @@ static inline void php_http_request_object_get_options_subr(INTERNAL_FUNCTION_PA
 		array_init(return_value);
 
 		if (	(Z_TYPE_P(opts) == IS_ARRAY) &&
-				(SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), key, len, (void *) &options))) {
+				(SUCCESS == zend_symtable_find(Z_ARRVAL_P(opts), key, len, (void *) &options))) {
 			convert_to_array(*options);
 			array_copy(Z_ARRVAL_PP(options), Z_ARRVAL_P(return_value));
 		}
@@ -717,7 +713,7 @@ PHP_METHOD(HttpRequest, getTransferInfo)
 		}
 
 		if (info_len && info_name) {
-			if (SUCCESS == zend_hash_find(Z_ARRVAL_P(info), php_http_pretty_key(info_name, info_len, 0, 0), info_len + 1, (void *) &infop)) {
+			if (SUCCESS == zend_symtable_find(Z_ARRVAL_P(info), php_http_pretty_key(info_name, info_len, 0, 0), info_len + 1, (void *) &infop)) {
 				RETVAL_ZVAL(*infop, 1, 0);
 			} else {
 				php_http_error(HE_NOTICE, PHP_HTTP_E_INVALID_PARAM, "Could not find transfer info named %s", info_name);
@@ -789,7 +785,7 @@ PHP_METHOD(HttpRequest, setOptions)
 				} else if (Z_TYPE_PP(opt) == IS_NULL) {
 					old_opts = zend_read_property(php_http_request_class_entry, getThis(), ZEND_STRL("options"), 0 TSRMLS_CC);
 					if (Z_TYPE_P(old_opts) == IS_ARRAY) {
-						zend_hash_del(Z_ARRVAL_P(old_opts), key.str, key.len);
+						zend_symtable_del(Z_ARRVAL_P(old_opts), key.str, key.len);
 					}
 				} else {
 					Z_ADDREF_P(*opt);
@@ -1119,7 +1115,7 @@ PHP_METHOD(HttpRequest, getResponseCookies)
 						FOREACH_VAL(pos2, *header, single_header) {
 							zval *data = php_http_ztyp(IS_STRING, *single_header);
 
-							if ((list = php_http_cookie_list_parse(NULL, Z_STRVAL_P(data), flags, allowed_extras TSRMLS_CC))) {
+							if ((list = php_http_cookie_list_parse(NULL, Z_STRVAL_P(data), Z_STRLEN_P(data), flags, allowed_extras TSRMLS_CC))) {
 								zval *cookie;
 
 								MAKE_STD_ZVAL(cookie);
@@ -1130,7 +1126,7 @@ PHP_METHOD(HttpRequest, getResponseCookies)
 						}
 					} else {
 						zval *data = php_http_ztyp(IS_STRING, *header);
-						if ((list = php_http_cookie_list_parse(NULL, Z_STRVAL_P(data), flags, allowed_extras TSRMLS_CC))) {
+						if ((list = php_http_cookie_list_parse(NULL, Z_STRVAL_P(data), Z_STRLEN_P(data), flags, allowed_extras TSRMLS_CC))) {
 							zval *cookie;
 
 							MAKE_STD_ZVAL(cookie);