X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=21939a062282561497b890a8456f8e2d7bdc7b7f;hp=e81deffd554b40bfeeb90e4650df77c283997858;hb=8d7fee64c740137b693630ad82374c11d1aaa76a;hpb=7dedd1935ab8400dfbd49fe63c83b74b0d0b68e6 diff --git a/http.c b/http.c index e81deff..21939a0 100644 --- a/http.c +++ b/http.c @@ -15,8 +15,10 @@ /* $Id$ */ +#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS + #ifdef HAVE_CONFIG_H -#include "config.h" +# include "config.h" #endif #include "php.h" @@ -29,16 +31,48 @@ #include "php_http.h" #include "php_http_api.h" -#if defined(HAVE_CURL) && HAVE_CURL -#include +#ifdef ZEND_ENGINE_2 +# include "ext/standard/php_http.h" #endif +#ifdef HTTP_HAVE_CURL + +# ifdef PHP_WIN32 +# include +# include +# endif + +# include + +/* {{{ 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) #ifdef COMPILE_DL_HTTP ZEND_GET_MODULE(http) #endif + /* {{{ http_functions[] */ function_entry http_functions[] = { PHP_FE(http_date, NULL) @@ -59,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) -#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) + PHP_FE(http_get_request_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} }; /* }}} */ @@ -481,7 +520,7 @@ PHP_FUNCTION(http_redirect) sprintf(RED, "Redirecting to %s.\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; @@ -638,6 +677,7 @@ PHP_FUNCTION(http_chunked_decode) * content body. The returned array may look simliar to the following example: * * 
+ *  array(
  *         'Status' => '200 Ok',
@@ -646,6 +686,7 @@ PHP_FUNCTION(http_chunked_decode)
  *     ),
  *     1 => "Hello World!"
  * );
+ * ?>
  *
*/ PHP_FUNCTION(http_split_response) @@ -662,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); @@ -670,8 +714,47 @@ 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 */ -#if defined(HAVE_CURL) && HAVE_CURL +#ifdef HTTP_HAVE_CURL /* {{{ proto string http_get(string url[, array options[, array &info]]) * @@ -703,8 +786,37 @@ PHP_FUNCTION(http_split_response) * * * 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: + * 
+ *  '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,
+ * )
+ * ?>
+ *
*/ PHP_FUNCTION(http_get) { @@ -942,7 +1054,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 +1069,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 +1087,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 +1106,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"