X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=21939a062282561497b890a8456f8e2d7bdc7b7f;hp=74e2968ec7839e831796611a4a0f807a6e21e0ba;hb=8d7fee64c740137b693630ad82374c11d1aaa76a;hpb=b587077029cfd30b2daf4f4d519f69c37fae1841

diff --git a/http.c b/http.c
index 74e2968..21939a0 100644
--- a/http.c
+++ b/http.c
@@ -18,7 +18,7 @@
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#	include "config.h"
 #endif
 
 #include "php.h"
@@ -31,15 +31,40 @@
 #include "php_http.h"
 #include "php_http_api.h"
 
-#ifdef HTTP_HAVE_CURL
-
-#ifdef PHP_WIN32
-#include <winsock2.h>
-#include <sys/types.h>
+#ifdef ZEND_ENGINE_2
+#	include "ext/standard/php_http.h"
 #endif
 
-#include <curl/curl.h>
-#endif
+#ifdef HTTP_HAVE_CURL
+
+#	ifdef PHP_WIN32
+#		include <winsock2.h>
+#		include <sys/types.h>
+#	endif
+
+#	include <curl/curl.h>
+
+/* {{{ 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_NONE, BYREF_FORCE};
+static unsigned char http_request_info_ref_4[] = {4, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE};
+#	endif
+/* }}} ARG_INFO */
+
+#endif /* HTTP_HAVE_CURL */
 
 ZEND_DECLARE_MODULE_GLOBALS(http)
 
@@ -47,6 +72,7 @@ ZEND_DECLARE_MODULE_GLOBALS(http)
 ZEND_GET_MODULE(http)
 #endif
 
+
 /* {{{ http_functions[] */
 function_entry http_functions[] = {
 	PHP_FE(http_date, NULL)
@@ -67,14 +93,19 @@ function_entry http_functions[] = {
 	PHP_FE(http_send_stream, NULL)
 	PHP_FE(http_chunked_decode, NULL)
 	PHP_FE(http_split_response, NULL)
+	PHP_FE(http_parse_headers, NULL)
+	PHP_FE(http_get_request_headers, NULL)
 #ifdef HTTP_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_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}
 };
 /* }}} */
@@ -646,6 +677,7 @@ PHP_FUNCTION(http_chunked_decode)
  * content body. The returned array may look simliar to the following example:
  *
  * <pre>
+ * <?php
  * array(
  *     0 => array(
  *         'Status' => '200 Ok',
@@ -654,6 +686,7 @@ PHP_FUNCTION(http_chunked_decode)
  *     ),
  *     1 => "Hello World!"
  * );
+ * ?>
  * </pre>
  */
 PHP_FUNCTION(http_split_response)
@@ -670,7 +703,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);
@@ -678,6 +714,45 @@ 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;
+	}
+}
+/* }}}*/
+
+/* {{{ proto array http_get_request_headers(void)
+ *
+ */
+PHP_FUNCTION(http_get_request_headers)
+{
+	if (ZEND_NUM_ARGS()) {
+		WRONG_PARAM_COUNT;
+	}
+
+	array_init(return_value);
+	http_get_request_headers(return_value);
+}
+/* }}} */
+
 /* {{{ HAVE_CURL */
 #ifdef HTTP_HAVE_CURL
 
@@ -711,8 +786,37 @@ PHP_FUNCTION(http_split_response)
  * </pre>
  *
  * The optional third parameter will be filled with some additional information
- * in form af an associative array, if supplied (don't forget to initialize it
- * with NULL or array()).
+ * in form af an associative array, if supplied, like the following example:
+ * <pre>
+ * <?php
+ * array (
+ *     'effective_url' => 'http://localhost',
+ *     'response_code' => 403,
+ *     'total_time' => 0.017,
+ *     'namelookup_time' => 0.013,
+ *     'connect_time' => 0.014,
+ *     'pretransfer_time' => 0.014,
+ *     'size_upload' => 0,
+ *     'size_download' => 202,
+ *     'speed_download' => 11882,
+ *     'speed_upload' => 0,
+ *     'header_size' => 145,
+ *     'request_size' => 62,
+ *     'ssl_verifyresult' => 0,
+ *     'filetime' => -1,
+ *     'content_length_download' => 202,
+ *     'content_length_upload' => 0,
+ *     'starttransfer_time' => 0.017,
+ *     'content_type' => 'text/html; charset=iso-8859-1',
+ *     'redirect_time' => 0,
+ *     'redirect_count' => 0,
+ *     'private' => '',
+ *     'http_connectcode' => 0,
+ *     'httpauth_avail' => 0,
+ *     'proxyauth_avail' => 0,
+ * )
+ * ?>
+ * </pre>
  */
 PHP_FUNCTION(http_get)
 {