X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=535a5aebe9a0dada0bdea5882a1819a8e68c4ae5;hp=56ae91d1024f3a3c3aa5292df29393aa85b32bd3;hb=6564b507fceb20fd8065d839cf8ec0091a7c4627;hpb=cf4b3590c1439ae0c70c7819f67308799b75ad1f diff --git a/http.c b/http.c index 56ae91d..535a5ae 100644 --- a/http.c +++ b/http.c @@ -15,36 +15,68 @@ /* $Id$ */ +#define _WINSOCKAPI_ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS #ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#if defined(HAVE_CURL) && HAVE_CURL -# ifdef PHP_WIN32 -# include -# include -# endif -#include +# include "config.h" #endif #include "php.h" +#include "php_ini.h" #include "snprintf.h" #include "ext/standard/info.h" #include "ext/session/php_session.h" #include "ext/standard/php_string.h" #include "ext/standard/php_smart_str.h" +#include "SAPI.h" + #include "php_http.h" #include "php_http_api.h" +#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) @@ -65,14 +97,20 @@ 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 + PHP_FE(ob_httpetaghandler, NULL) {NULL, NULL, NULL} }; /* }}} */ @@ -403,28 +441,57 @@ PHP_FUNCTION(http_cache_etag) RETURN_FALSE; } - php_end_ob_buffers(0 TSRMLS_CC); http_send_header("Cache-Control: private, must-revalidate, max-age=0"); - /* if no etag is given and we didn't already - * start ob_etaghandler -- start it - */ - if (!HTTP_G(etag_started) && !etag_len) { - php_ob_set_internal_handler(_http_ob_etaghandler, (uint) 4096, "etag output handler", 0 TSRMLS_CC); - HTTP_G(etag_started) = 1; - RETURN_BOOL(php_start_ob_buffer_named("etag output handler", (uint) 4096, 0 TSRMLS_CC)); + if (etag_len) { + http_send_etag(etag, etag_len); + if (http_etag_match("HTTP_IF_NONE_MATCH", etag)) { + if (SUCCESS == http_send_status(304)) { + zend_bailout(); + } else { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not send 304 Not Modified"); + RETURN_FALSE; + } + } } - if (http_etag_match("HTTP_IF_NONE_MATCH", etag)) { - if (SUCCESS == http_send_status(304)) { - zend_bailout(); - } else { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not send 304 Not Modified"); + /* if no etag is given and we didn't already start ob_etaghandler -- start it */ + if (!HTTP_G(etag_started)) { + RETURN_BOOL(HTTP_G(etag_started) = (SUCCESS == http_start_ob_handler(_http_ob_etaghandler, "ob_etaghandler", 0, 1))); + } + RETURN_TRUE; +} +/* }}} */ + +/* {{{ proto string ob_httpetaghandler(string data, int mode) + * + * For use with ob_start(). Note that this has to be started as first output buffer. + */ +PHP_FUNCTION(ob_httpetaghandler) +{ + char *data; + int data_len; + long mode; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl", &data, &data_len, &mode)) { + RETURN_FALSE; + } + + if (mode & PHP_OUTPUT_HANDLER_START) { + if (HTTP_G(etag_started)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "ob_etaghandler can only be used once"); + RETURN_FALSE; + } + if (OG(ob_nesting_level)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "must be started prior to other output buffers"); RETURN_FALSE; } + http_send_header("Cache-Control: private, must-revalidate, max-age=0"); + HTTP_G(etag_started) = 1; } - - RETURN_SUCCESS(http_send_etag(etag, etag_len)); + + Z_TYPE_P(return_value) = IS_STRING; + http_ob_etaghandler(data, data_len, &Z_STRVAL_P(return_value), &Z_STRLEN_P(return_value), mode); } /* }}} */ @@ -644,6 +711,7 @@ PHP_FUNCTION(http_chunked_decode) * content body. The returned array may look simliar to the following example: * * 
+ *  array(
  *         'Status' => '200 Ok',
@@ -652,6 +720,7 @@ PHP_FUNCTION(http_chunked_decode)
  *     ),
  *     1 => "Hello World!"
  * );
+ * ?>
  *
*/ PHP_FUNCTION(http_split_response) @@ -668,7 +737,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); @@ -676,8 +748,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]]) * @@ -709,8 +820,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) { @@ -948,7 +1088,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; @@ -956,14 +1096,43 @@ static void php_http_init_globals(zend_http_globals *http_globals) http_globals->curlbuf.hdrs.used = 0; http_globals->curlbuf.hdrs.free = 0; #endif + http_globals->allowed_methods = NULL; +} +/* }}} */ + +/* {{{ static inline STATUS http_check_allowed_methods(char *, int) */ +#define http_check_allowed_methods(m, l) _http_check_allowed_methods((m), (l) TSRMLS_CC) +static inline void _http_check_allowed_methods(char *methods, int length TSRMLS_DC) +{ + if (length && SG(request_info).request_method && (!strstr(methods, SG(request_info).request_method))) { + char *allow_header = emalloc(length + sizeof("Allow: ")); + sprintf(allow_header, "Allow: %s", methods); + http_send_header(allow_header); + efree(allow_header); + http_send_status(405); + zend_bailout(); + } } /* }}} */ +/* {{{ PHP_INI */ +PHP_INI_MH(update_allowed_methods) +{ + http_check_allowed_methods(new_value, new_value_length); + return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); +} + +PHP_INI_BEGIN() + STD_PHP_INI_ENTRY("http.allowed_methods", "OPTIONS,GET,HEAD,POST,PUT,DELETE,TRACE,CONNECT", PHP_INI_ALL, update_allowed_methods, allowed_methods, zend_http_globals, http_globals) +PHP_INI_END() +/* }}} */ + /* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(http) { ZEND_INIT_MODULE_GLOBALS(http, php_http_init_globals, NULL); -#if defined(HAVE_CURL) && HAVE_CURL + REGISTER_INI_ENTRIES(); +#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); @@ -972,21 +1141,46 @@ PHP_MINIT_FUNCTION(http) } /* }}} */ +/* {{{ PHP_MSHUTDOWN_FUNCTION */ +PHP_MSHUTDOWN_FUNCTION(http) +{ + UNREGISTER_INI_ENTRIES(); + return SUCCESS; +} +/* }}} */ + +/* {{{ PHP_RINIT_FUNCTION */ +PHP_RINIT_FUNCTION(http) +{ + char *allowed_methods = INI_STR("http.allowed_methods"); + http_check_allowed_methods(allowed_methods, strlen(allowed_methods)); + return SUCCESS; +} +/* }}} */ + /* {{{ PHP_RSHUTDOWN_FUNCTION */ PHP_RSHUTDOWN_FUNCTION(http) { - if (HTTP_G(ctype)) { - efree(HTTP_G(ctype)); - } + HTTP_G(etag_started) = 0; + HTTP_G(lmod) = 0; + if (HTTP_G(etag)) { efree(HTTP_G(etag)); + HTTP_G(etag) = NULL; + } + + if (HTTP_G(ctype)) { + efree(HTTP_G(ctype)); + HTTP_G(ctype) = NULL; } -#if defined(HAVE_CURL) && HAVE_CURL +#ifdef HTTP_HAVE_CURL if (HTTP_G(curlbuf).body.data) { efree(HTTP_G(curlbuf).body.data); + HTTP_G(curlbuf).body.data = NULL; } if (HTTP_G(curlbuf).hdrs.data) { efree(HTTP_G(curlbuf).hdrs.data); + HTTP_G(curlbuf).hdrs.data = NULL; } #endif return SUCCESS; @@ -1000,13 +1194,15 @@ 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" #endif ); php_info_print_table_end(); + + DISPLAY_INI_ENTRIES(); } /* }}} */