* renaming tests

[m6w6/ext-http] / php_http.h

diff --git a/php_http.h b/php_http.h
index 447a09b1fa1c7f37e38498fdc8e2fcef8891dc93..ea2c2559e0262b81f666cb6f131567ac84d53996 100644 (file)
--- a/php_http.h
+++ b/php_http.h
@@ -18,7 +18,7 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
-#define PHP_EXT_HTTP_VERSION "0.6.0"
+#define PHP_EXT_HTTP_VERSION "0.7.0-dev"
 
 /* make compile on Win32 */
 #include "php_streams.h"
@@ -42,6 +42,10 @@ typedef struct {
 
 #ifdef HTTP_HAVE_CURL
 
+#ifdef PHP_WIN32
+#      include <winsock2.h>
+#endif
+
 #include <curl/curl.h>
 
 typedef struct {
@@ -55,7 +59,7 @@ typedef enum {
        HTTP_POST,
 } http_request_method;
 
-#endif
+#endif /* HTTP_HAVE _CURL */
 
 PHP_METHOD(HTTPi, date);
 PHP_METHOD(HTTPi, absoluteURI);
@@ -79,7 +83,7 @@ PHP_METHOD(HTTPi, get);
 PHP_METHOD(HTTPi, head);
 PHP_METHOD(HTTPi, postData);
 PHP_METHOD(HTTPi, postArray);
-#endif
+#endif /* HTTP_HAVE_CURL */
 PHP_METHOD(HTTPi, authBasic);
 PHP_METHOD(HTTPi, authBasicCallback);
 
@@ -131,7 +135,8 @@ PHP_METHOD(HTTPi_Request, getPostFiles);
 PHP_METHOD(HTTPi_Request, unsetPostFiles);
 PHP_METHOD(HTTPi_Request, send);
 PHP_METHOD(HTTPi_Request, getResponseData);
-PHP_METHOD(HTTPi_Request, getResponseHeaders);
+PHP_METHOD(HTTPi_Request, getResponseHeader);
+PHP_METHOD(HTTPi_Request, getResponseCode);
 PHP_METHOD(HTTPi_Request, getResponseBody);
 PHP_METHOD(HTTPi_Request, getResponseInfo);
 
@@ -165,12 +170,12 @@ PHP_FUNCTION(http_get);
 PHP_FUNCTION(http_head);
 PHP_FUNCTION(http_post_data);
 PHP_FUNCTION(http_post_array);
-#endif
+#endif /* HTTP_HAVE_CURL */
 PHP_FUNCTION(http_auth_basic);
 PHP_FUNCTION(http_auth_basic_cb);
 #ifndef ZEND_ENGINE_2
 PHP_FUNCTION(http_build_query);
-#endif
+#endif /* ZEND_ENGINE_2 */
 PHP_FUNCTION(ob_httpetaghandler);
 
 PHP_MINIT_FUNCTION(http);
@@ -195,7 +200,7 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
                size_t size;
        } curlbuf;
        zend_llist to_free;
-#endif
+#endif /* HTTP_HAVE_CURL */
 ZEND_END_MODULE_GLOBALS(http)
 
 #endif /* PHP_HTTP_H */