#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
#ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
#endif
#include "php.h"
#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)
ZEND_GET_MODULE(http)
#endif
+
/* {{{ http_functions[] */
function_entry http_functions[] = {
PHP_FE(http_date, NULL)
PHP_FE(http_send_stream, NULL)
PHP_FE(http_chunked_decode, NULL)
PHP_FE(http_split_response, NULL)
+ 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)
- 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}
};
/* }}} */
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);
}
/* }}} */
+/* {{{ 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 */
#ifdef HTTP_HAVE_CURL