X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_request.c;h=26e87f6ab066f200ca0c92528863a2744cd73ad3;hb=1e674ad6a7e867b1b4d04db098b59981fe3f011d;hp=9d4819d24eb13c6b39377ae7d7cb1ee89a59a62b;hpb=8d05291f42b3b42159b3fe91492aa4862f3d4405;p=m6w6%2Fext-http

diff --git a/php_http_request.c b/php_http_request.c
index 9d4819d..26e87f6 100644
--- a/php_http_request.c
+++ b/php_http_request.c
@@ -10,11 +10,9 @@
     +--------------------------------------------------------------------+
 */
 
-#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)
 {
@@ -26,7 +24,7 @@ PHP_HTTP_API php_http_request_t *php_http_request_init(php_http_request_t *h, ph
 	memset(h, 0, sizeof(*h));
 
 	h->ops = ops;
-	h->rf = rf ? rf : php_http_resource_factory_init(NULL, h->ops->rsrc, NULL, NULL);
+	h->rf = rf ? rf : php_http_resource_factory_init(NULL, h->ops->rsrc, h, NULL);
 	h->buffer = php_http_buffer_init(NULL);
 	h->parser = php_http_message_parser_init(NULL TSRMLS_CC);
 	h->message = php_http_message_init(NULL, 0 TSRMLS_CC);
@@ -546,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;
@@ -1116,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);
@@ -1127,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);