X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=6efc142e9745cf43fd8ff9be481736e480d1626c;hp=9a3ed65c224e81ba4b5ee9981721e0517d6fee3d;hb=96d32e2bd4a5d2b0741addf6f59b46d7d8749937;hpb=a5765d1d51e444d9165c591a59d5b4c5bf9294b2 diff --git a/http.c b/http.c index 9a3ed65..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 +#include +#endif + #include #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} }; /* }}} */ @@ -347,12 +363,12 @@ PHP_FUNCTION(http_cache_last_modified) /* 0 or omitted */ if (!last_modified) { - /* does the client have? */ + /* does the client have? (att: caching "forever") */ if (zlm = http_get_server_var("HTTP_IF_MODIFIED_SINCE")) { last_modified = send_modified = http_parse_date(Z_STRVAL_P(zlm)); - /* use current time */ + /* send current time */ } else { - last_modified = send_modified = t; + send_modified = t; } /* negative value is supposed to be expiration time */ } else if (last_modified < 0) { @@ -397,8 +413,7 @@ PHP_FUNCTION(http_cache_etag) RETURN_FALSE; } - /* send remaining data to nirvana */ - http_send_header("Connection: close"); + 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 @@ -434,6 +449,8 @@ PHP_FUNCTION(http_cache_etag) * ("301 Moved Permanently") or a temporary ("302 Found") redirection * status code. * + * To be RFC compliant, "Redirecting to URI." will be displayed, + * if the client doesn't redirect immediatly. */ PHP_FUNCTION(http_redirect) { @@ -441,9 +458,9 @@ PHP_FUNCTION(http_redirect) zend_bool session = 0, permanent = 0; zval *params = NULL; smart_str qstr = {0}; - char *url, *URI, LOC[HTTP_URI_MAXLEN + 9]; + char *url, *URI, LOC[HTTP_URI_MAXLEN + 9], RED[HTTP_URI_MAXLEN * 2 + 34]; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sa!bb", &url, &url_len, ¶ms, &session, &permanent) != SUCCESS) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sa!/bb", &url, &url_len, ¶ms, &session, &permanent) != SUCCESS) { RETURN_FALSE; } @@ -473,13 +490,19 @@ PHP_FUNCTION(http_redirect) URI = http_absolute_uri(url, NULL); if (qstr.c) { snprintf(LOC, HTTP_URI_MAXLEN + strlen("Location: "), "Location: %s?%s", URI, qstr.c); + sprintf(RED, "Redirecting to %s?%s.\n", URI, qstr.c, URI, qstr.c); efree(qstr.c); } else { snprintf(LOC, HTTP_URI_MAXLEN + strlen("Location: "), "Location: %s", URI); + sprintf(RED, "Redirecting to %s.\n", URI, URI); } efree(URI); - RETVAL_BOOL((SUCCESS == http_send_header(LOC)) && (SUCCESS == http_send_status((permanent ? 301 : 302)))); + if ((SUCCESS == http_send_header(LOC)) && (SUCCESS == http_send_status((permanent ? 301 : 302)))) { + php_body_write(RED, strlen(RED) TSRMLS_CC); + RETURN_TRUE; + } + RETURN_FALSE; } /* }}} */ @@ -655,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); @@ -663,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]]) * @@ -933,7 +982,9 @@ static void php_http_init_globals(zend_http_globals *http_globals) { http_globals->etag_started = 0; http_globals->ctype = NULL; -#if defined(HAVE_CURL) && HAVE_CURL + http_globals->etag = NULL; + http_globals->lmod = 0; +#ifdef HTTP_HAVE_CURL http_globals->curlbuf.body.data = NULL; http_globals->curlbuf.body.used = 0; http_globals->curlbuf.body.free = 0; @@ -948,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); @@ -963,7 +1014,10 @@ PHP_RSHUTDOWN_FUNCTION(http) if (HTTP_G(ctype)) { efree(HTTP_G(ctype)); } -#if defined(HAVE_CURL) && HAVE_CURL + if (HTTP_G(etag)) { + efree(HTTP_G(etag)); + } +#ifdef HTTP_HAVE_CURL if (HTTP_G(curlbuf).body.data) { efree(HTTP_G(curlbuf).body.data); } @@ -982,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" @@ -1000,3 +1054,4 @@ PHP_MINFO_FUNCTION(http) * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 */ +