X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=6efc142e9745cf43fd8ff9be481736e480d1626c;hp=e81deffd554b40bfeeb90e4650df77c283997858;hb=96d32e2bd4a5d2b0741addf6f59b46d7d8749937;hpb=7dedd1935ab8400dfbd49fe63c83b74b0d0b68e6

diff --git a/http.c b/http.c
index e81deff..6efc142 100644
--- 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,7 +31,17 @@
 #include "php_http.h"
 #include "php_http_api.h"
 
-#if defined(HAVE_CURL) && HAVE_CURL
+#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
 
@@ -59,7 +71,8 @@ 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_parse_headers, NULL)
+#ifdef HTTP_HAVE_CURL
 	PHP_FE(http_get, NULL)
 	PHP_FE(http_head, NULL)
 	PHP_FE(http_post_data, NULL)
@@ -67,6 +80,9 @@ function_entry http_functions[] = {
 #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}
 };
 /* }}} */
@@ -481,7 +497,7 @@ PHP_FUNCTION(http_redirect)
 		sprintf(RED, "Redirecting to <a href=\"%s\">%s</a>.\n", URI, URI);
 	}
 	efree(URI);
-	
+
 	if ((SUCCESS == http_send_header(LOC)) && (SUCCESS == http_send_status((permanent ? 301 : 302)))) {
 		php_body_write(RED, strlen(RED) TSRMLS_CC);
 		RETURN_TRUE;
@@ -662,7 +678,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);
@@ -670,8 +689,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]])
  *
@@ -942,7 +984,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;
@@ -957,7 +999,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);
@@ -975,7 +1017,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);
 	}
@@ -994,7 +1036,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"