X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_functions.c;h=f42fccba9b28c02eadb76488aed0f8607194ab7e;hp=3ed49b22f6e8b8261a9737cba6c3d80793e31055;hb=7038c951485d1b2afa79c9a84b8dcdcb57c9bc54;hpb=f6e558f7886fff36d239ae2fae69d955ac6925ee

diff --git a/http_functions.c b/http_functions.c
index 3ed49b2..f42fccb 100644
--- a/http_functions.c
+++ b/http_functions.c
@@ -15,9 +15,6 @@
 
 /* $Id$ */
 
-#define _WINSOCKAPI_
-#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
-
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
@@ -376,7 +373,7 @@ PHP_FUNCTION(http_cache_last_modified)
  */
 PHP_FUNCTION(http_cache_etag)
 {
-	char *etag;
+	char *etag = NULL;
 	int etag_len = 0;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &etag, &etag_len) != SUCCESS) {
@@ -469,7 +466,7 @@ PHP_FUNCTION(http_redirect)
 	}
 
 	URI = http_absolute_uri(url);
-	
+
 	if (query_len) {
 		snprintf(LOC, HTTP_URI_MAXLEN + sizeof("Location: "), "Location: %s?%s", URI, query);
 		sprintf(RED, "Redirecting to <a href=\"%s?%s\">%s?%s</a>.\n", URI, query, URI, query);
@@ -598,7 +595,7 @@ PHP_FUNCTION(http_split_response)
 		RETURN_FALSE;
 	}
 
-	convert_to_string_ex(&zresponse);
+	convert_to_string(zresponse);
 
 	MAKE_STD_ZVAL(zbody);
 	MAKE_STD_ZVAL(zheaders);
@@ -632,8 +629,8 @@ PHP_FUNCTION(http_parse_headers)
 	if (rnrn = strstr(header, HTTP_CRLF HTTP_CRLF)) {
 		header_len = rnrn - header + 2;
 	}
-	if (SUCCESS != http_parse_headers(header, header_len, Z_ARRVAL_P(return_value))) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not parse HTTP header");
+	if (SUCCESS != http_parse_headers(header, header_len, return_value)) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not parse HTTP headers");
 		zval_dtor(return_value);
 		RETURN_FALSE;
 	}