* force ref for $info in http_request functions

[m6w6/ext-http] / http.c

diff --git a/http.c b/http.c
index 2142eab9a9068bebb6c2f06d8e1fbfe4ce395b47..b95204604421ec6c01a01a67e72a2655dce11bf4 100644 (file)
--- a/http.c
+++ b/http.c
@@ -15,6 +15,8 @@
 
 /* $Id$ */
 
+#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -29,11 +31,17 @@
 #include "php_http.h"
 #include "php_http_api.h"
 
-#if defined(HAVE_CURL) && HAVE_CURL
-#      ifdef PHP_WIN32
-#      include <winsock2.h>
-#      include <sys/types.h>
-#      endif
+#ifdef ZEND_ENGINE_2
+#include "ext/standard/php_http.h"
+#endif
+
+#ifdef HTTP_HAVE_CURL
+
+#ifdef PHP_WIN32
+#include <winsock2.h>
+#include <sys/types.h>
+#endif
+
 #include <curl/curl.h>
 #endif
 
@@ -43,6 +51,26 @@ ZEND_DECLARE_MODULE_GLOBALS(http)
 ZEND_GET_MODULE(http)
 #endif
 
+/* {{{ ARG_INFO */
+#ifdef ZEND_BEGIN_ARG_INFO
+ZEND_BEGIN_ARG_INFO(http_request_info_ref_3, 0)
+       ZEND_ARG_PASS_INFO(0)
+       ZEND_ARG_PASS_INFO(0)
+       ZEND_ARG_PASS_INFO(1)
+ZEND_END_ARG_INFO();
+
+ZEND_BEGIN_ARG_INFO(http_request_info_ref_4, 0)
+       ZEND_ARG_PASS_INFO(0)
+       ZEND_ARG_PASS_INFO(0)
+       ZEND_ARG_PASS_INFO(0)
+       ZEND_ARG_PASS_INFO(1)
+ZEND_END_ARG_INFO();
+#else
+static unsigned char http_request_info_ref_3[] = {3, BYREF_NONE, BYREF_FORCE_REST};
+static unsigned char http_request_info_ref_4[] = {4, BYREF_NONE, BYREF_FORCE_REST};
+#endif
+/* }}}*/
+
 /* {{{ http_functions[] */
 function_entry http_functions[] = {
        PHP_FE(http_date, NULL)
@@ -63,14 +91,18 @@ function_entry http_functions[] = {
        PHP_FE(http_send_stream, NULL)
        PHP_FE(http_chunked_decode, NULL)
        PHP_FE(http_split_response, NULL)
-#if defined(HAVE_CURL) && HAVE_CURL
-       PHP_FE(http_get, NULL)
-       PHP_FE(http_head, NULL)
-       PHP_FE(http_post_data, NULL)
-       PHP_FE(http_post_array, NULL)
+       PHP_FE(http_parse_headers, NULL)
+#ifdef HTTP_HAVE_CURL
+       PHP_FE(http_get, http_request_info_ref_3)
+       PHP_FE(http_head, http_request_info_ref_3)
+       PHP_FE(http_post_data, http_request_info_ref_4)
+       PHP_FE(http_post_array, http_request_info_ref_4)
 #endif
        PHP_FE(http_auth_basic, NULL)
        PHP_FE(http_auth_basic_cb, NULL)
+#ifndef ZEND_ENGINE_2
+       PHP_FE(http_build_query, NULL)
+#endif
        {NULL, NULL, NULL}
 };
 /* }}} */
@@ -666,7 +698,10 @@ PHP_FUNCTION(http_split_response)
        MAKE_STD_ZVAL(zheaders);
        array_init(zheaders);
 
-       http_split_response(zresponse, zheaders, zbody);
+       if (SUCCESS != http_split_response(zresponse, zheaders, zbody)) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not parse HTTP response");
+               RETURN_FALSE;
+       }
 
        array_init(return_value);
        add_index_zval(return_value, 0, zheaders);
@@ -674,8 +709,31 @@ PHP_FUNCTION(http_split_response)
 }
 /* }}} */
 
+/* {{{ proto array http_parse_headers(string header) */
+PHP_FUNCTION(http_parse_headers)
+{
+       char *header, *rnrn;
+       int header_len;
+
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &header, &header_len)) {
+               RETURN_FALSE;
+       }
+
+       array_init(return_value);
+
+       if (rnrn = strstr(header, HTTP_CRLF HTTP_CRLF)) {
+               header_len = rnrn - header + 2;
+       }
+       if (SUCCESS != http_parse_headers(header, header_len, return_value)) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not parse HTTP header");
+               zval_dtor(return_value);
+               RETURN_FALSE;
+       }
+}
+/* }}}*/
+
 /* {{{ HAVE_CURL */
-#if defined(HAVE_CURL) && HAVE_CURL
+#ifdef HTTP_HAVE_CURL
 
 /* {{{ proto string http_get(string url[, array options[, array &info]])
  *
@@ -946,7 +1004,7 @@ static void php_http_init_globals(zend_http_globals *http_globals)
        http_globals->ctype = NULL;
        http_globals->etag  = NULL;
        http_globals->lmod  = 0;
-#if defined(HAVE_CURL) && HAVE_CURL
+#ifdef HTTP_HAVE_CURL
        http_globals->curlbuf.body.data = NULL;
        http_globals->curlbuf.body.used = 0;
        http_globals->curlbuf.body.free = 0;
@@ -961,7 +1019,7 @@ static void php_http_init_globals(zend_http_globals *http_globals)
 PHP_MINIT_FUNCTION(http)
 {
        ZEND_INIT_MODULE_GLOBALS(http, php_http_init_globals, NULL);
-#if defined(HAVE_CURL) && HAVE_CURL
+#ifdef HTTP_HAVE_CURL
        REGISTER_LONG_CONSTANT("HTTP_AUTH_BASIC", CURLAUTH_BASIC, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("HTTP_AUTH_DIGEST", CURLAUTH_DIGEST, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("HTTP_AUTH_NTLM", CURLAUTH_NTLM, CONST_CS | CONST_PERSISTENT);
@@ -979,7 +1037,7 @@ PHP_RSHUTDOWN_FUNCTION(http)
        if (HTTP_G(etag)) {
                efree(HTTP_G(etag));
        }
-#if defined(HAVE_CURL) && HAVE_CURL
+#ifdef HTTP_HAVE_CURL
        if (HTTP_G(curlbuf).body.data) {
                efree(HTTP_G(curlbuf).body.data);
        }
@@ -998,7 +1056,7 @@ PHP_MINFO_FUNCTION(http)
        php_info_print_table_header(2, "Extended HTTP support", "enabled");
        php_info_print_table_row(2, "Version:", PHP_EXT_HTTP_VERSION);
        php_info_print_table_row(2, "cURL convenience functions:",
-#if defined(HAVE_CURL) && HAVE_CURL
+#ifdef HTTP_HAVE_CURL
                        "enabled"
 #else
                        "disabled"