* renamed classes

[m6w6/ext-http] / http_functions.c

diff --git a/http_functions.c b/http_functions.c
index f4d32b202ef5a4313fe467a0d03db364543be8ad..f42fccba9b28c02eadb76488aed0f8607194ab7e 100644 (file)
--- 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) {
@@ -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);