header cleanups; fix IDE warnings

[m6w6/ext-http] / php_http_request.c

diff --git a/php_http_request.c b/php_http_request.c
index 9d4819d24eb13c6b39377ae7d7cb1ee89a59a62b..ea4d4dd39de76b5108c8e118cebae5fc56c82e7e 100644 (file)
--- 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)
 {
@@ -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);