* keep winsock crap outta door

diff --git a/http.c b/http.c
index 677cf9dd454350c6264d48139df503048f8eaacc..0132ff93681d47a8953f6a4a2629b082d287e674 100644 (file)
--- a/http.c
+++ b/http.c
@@ -15,6 +15,7 @@
 
 /* $Id$ */
 
 
 /* $Id$ */
 

+#define _WINSOCKAPI_

 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
 #ifdef HAVE_CONFIG_H
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
 #ifdef HAVE_CONFIG_H


@@ -445,7 +446,7 @@ PHP_FUNCTION(http_cache_etag)
        if (etag_len) {
                RETURN_SUCCESS(http_send_etag(etag, etag_len));
        }
        if (etag_len) {
                RETURN_SUCCESS(http_send_etag(etag, etag_len));
        }

-       
+

        /* if no etag is given and we didn't already
         * start ob_etaghandler -- start it
         */
        /* if no etag is given and we didn't already
         * start ob_etaghandler -- start it
         */


@@ -1135,12 +1136,12 @@ PHP_RSHUTDOWN_FUNCTION(http)
 {
        HTTP_G(etag_started) = 0;
        HTTP_G(lmod) = 0;
 {
        HTTP_G(etag_started) = 0;
        HTTP_G(lmod) = 0;

-       
+

        if (HTTP_G(etag)) {
                efree(HTTP_G(etag));
                HTTP_G(etag) = NULL;
        }
        if (HTTP_G(etag)) {
                efree(HTTP_G(etag));
                HTTP_G(etag) = NULL;
        }

-       
+

        if (HTTP_G(ctype)) {
                efree(HTTP_G(ctype));
                HTTP_G(ctype) = NULL;
        if (HTTP_G(ctype)) {
                efree(HTTP_G(ctype));
                HTTP_G(ctype) = NULL;

diff --git a/http_api.c b/http_api.c
index c04b2e877c2d9e59c909162b0cd242f7ac04fb83..c5f25cfbb78b10d854b247c7a4e00fc5e55c5422 100644 (file)
--- a/http_api.c
+++ b/http_api.c
@@ -15,6 +15,7 @@
 
 /* $Id$ */
 
 
 /* $Id$ */
 

+#define _WINSOCKAPI_

 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
 #ifdef HAVE_CONFIG_H
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
 #ifdef HAVE_CONFIG_H