X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=http_functions.c;h=341cec245070baf8d7af3dc89664bf914a30456a;hb=13dc652c45a4a0b4dc219e46065bb3310229cedc;hp=cbf9ad657d69c28a6b3a1170856c98e5ec988a65;hpb=90e21e68c6e34565be798ee0f225b5823016afce;p=m6w6%2Fext-http
diff --git a/http_functions.c b/http_functions.c
index cbf9ad6..341cec2 100644
--- a/http_functions.c
+++ b/http_functions.c
@@ -12,17 +12,12 @@
/* $Id$ */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
+#define HTTP_WANT_SAPI
#define HTTP_WANT_CURL
#define HTTP_WANT_ZLIB
#include "php_http.h"
-#include "SAPI.h"
#include "php_ini.h"
-#include "ext/standard/info.h"
#include "ext/standard/php_string.h"
#include "zend_operators.h"
@@ -46,8 +41,8 @@
* Compose a valid HTTP date regarding RFC 822/1123
* looking like: "Wed, 22 Dec 2004 11:34:47 GMT"
*
- * Takes an optional unix timestamp as parameter.
- *
+ * Accepts an optional unix timestamp as parameter.
+ *
* Returns the HTTP date as string.
*/
PHP_FUNCTION(http_date)
@@ -59,14 +54,14 @@ PHP_FUNCTION(http_date)
}
if (t == -1) {
- t = (long) time(NULL);
+ t = (long) HTTP_GET_REQUEST_TIME();
}
RETURN_STRING(http_date(t), 0);
}
/* }}} */
-/* {{{ proto string http_build_url(mixed url[, mixed parts[, array &new_url]])
+/* {{{ proto string http_build_url(mixed url[, mixed parts[, int flags = HTTP_URL_REPLACE[, array &new_url]]])
*
* Returns the new URL as string on success or FALSE on failure.
*/
@@ -74,10 +69,11 @@ PHP_FUNCTION(http_build_url)
{
char *url_str = NULL;
size_t url_len = 0;
+ long flags = HTTP_URL_REPLACE;
zval *z_old_url = NULL, *z_new_url = NULL, *z_composed_url = NULL;
php_url *old_url = NULL, *new_url = NULL, *composed_url = NULL;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/|z/z", &z_old_url, &z_new_url, &z_composed_url) != SUCCESS) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/|z/lz", &z_old_url, &z_new_url, &flags, &z_composed_url) != SUCCESS) {
RETURN_FALSE;
}
@@ -107,7 +103,7 @@ PHP_FUNCTION(http_build_url)
}
if (z_composed_url) {
- http_build_url(old_url, new_url, &composed_url, &url_str, &url_len);
+ http_build_url(flags, old_url, new_url, &composed_url, &url_str, &url_len);
zval_dtor(z_composed_url);
array_init(z_composed_url);
@@ -137,7 +133,7 @@ PHP_FUNCTION(http_build_url)
}
php_url_free(composed_url);
} else {
- http_build_url(old_url, new_url, NULL, &url_str, &url_len);
+ http_build_url(flags, old_url, new_url, NULL, &url_str, &url_len);
}
if (new_url) {
@@ -376,7 +372,7 @@ PHP_FUNCTION(http_send_last_modified)
}
if (t == -1) {
- t = (long) time(NULL);
+ t = (long) HTTP_GET_REQUEST_TIME();
}
RETURN_SUCCESS(http_send_last_modified(t));
@@ -456,7 +452,7 @@ PHP_FUNCTION(http_match_modified)
// current time if not supplied (senseless though)
if (t == -1) {
- t = (long) time(NULL);
+ t = (long) HTTP_GET_REQUEST_TIME();
}
if (for_range) {
@@ -524,7 +520,7 @@ PHP_FUNCTION(http_cache_last_modified)
HTTP_CHECK_HEADERS_SENT(RETURN_FALSE);
- t = (long) time(NULL);
+ t = (long) HTTP_GET_REQUEST_TIME();
/* 0 or omitted */
if (!last_modified) {
@@ -642,10 +638,11 @@ PHP_FUNCTION(http_throttle)
*
* The HTTP response code will be set according to status.
* You can use one of the following constants for convenience:
- * - HTTP_REDIRECT 302 Found
- * - HTTP_REDIRECT_AUTO 303 See Other for POST, else 302 Found
+ * - HTTP_REDIRECT 302 Found for GET/HEAD, else 303 See Other
* - HTTP_REDIRECT_PERM 301 Moved Permanently
+ * - HTTP_REDIRECT_FOUND 302 Found
* - HTTP_REDIRECT_POST 303 See Other
+ * - HTTP_REDIRECT_PROXY 305 Use Proxy
* - HTTP_REDIRECT_TEMP 307 Temporary Redirect
*
* Please see http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.3
@@ -666,7 +663,7 @@ PHP_FUNCTION(http_redirect)
size_t query_len = 0;
zend_bool session = 0, free_params = 0;
zval *params = NULL;
- long status = HTTP_REDIRECT_AUTO;
+ long status = HTTP_REDIRECT;
char *query = NULL, *url = NULL, *URI, *LOC, *RED = NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sa!/bl", &url, &url_len, ¶ms, &session, &status) != SUCCESS) {
@@ -707,10 +704,14 @@ PHP_FUNCTION(http_redirect)
if (query_len) {
spprintf(&LOC, 0, "Location: %s?%s", URI, query);
- spprintf(&RED, 0, "Redirecting to %s?%s.\n", URI, query, URI, query);
+ if (status != 300) {
+ spprintf(&RED, 0, "Redirecting to %s?%s.\n", URI, query, URI, query);
+ }
} else {
spprintf(&LOC, 0, "Location: %s", URI);
- spprintf(&RED, 0, "Redirecting to %s.\n", URI, URI);
+ if (status != 300) {
+ spprintf(&RED, 0, "Redirecting to %s.\n", URI, URI);
+ }
}
efree(URI);
@@ -722,11 +723,34 @@ PHP_FUNCTION(http_redirect)
FREE_ZVAL(params);
}
-#ifndef ZEND_ENGINE_2
- if (!status && SG(request_info).request_method && !strcasecmp(SG(request_info).request_method, "POST")) {
- status = HTTP_REDIRECT_POST;
+ switch (status)
+ {
+ case 300:
+ RETVAL_SUCCESS(http_send_status_header(status, LOC));
+ efree(LOC);
+ return;
+ break;
+
+ case HTTP_REDIRECT_PERM:
+ case HTTP_REDIRECT_FOUND:
+ case HTTP_REDIRECT_POST:
+ case HTTP_REDIRECT_PROXY:
+ case HTTP_REDIRECT_TEMP:
+ break;
+
+ case 306:
+ default:
+ http_error_ex(HE_NOTICE, HTTP_E_RUNTIME, "Unsupported redirection status code: %ld", status);
+ case HTTP_REDIRECT:
+ if ( SG(request_info).request_method &&
+ strcasecmp(SG(request_info).request_method, "HEAD") &&
+ strcasecmp(SG(request_info).request_method, "GET")) {
+ status = HTTP_REDIRECT_POST;
+ } else {
+ status = HTTP_REDIRECT_FOUND;
+ }
+ break;
}
-#endif
RETURN_SUCCESS(http_exit_ex(status, LOC, RED, 1));
}
@@ -992,7 +1016,10 @@ PHP_FUNCTION(http_get_request_headers)
*
* Get the raw request body (e.g. POST or PUT data).
*
- * Returns NULL when using the CLI SAPI.
+ * This function can not be used after http_get_request_body_stream()
+ * if the request method was another than POST.
+ *
+ * Returns the raw request body as string on success or NULL on failure.
*/
PHP_FUNCTION(http_get_request_body)
{
@@ -1009,6 +1036,29 @@ PHP_FUNCTION(http_get_request_body)
}
/* }}} */
+/* {{{ proto resource http_get_request_body_stream(void)
+ *
+ * Create a stream to read the raw request body (e.g. POST or PUT data).
+ *
+ * This function can only be used once if the request method was another than POST.
+ *
+ * Returns the raw request body as stream on success or NULL on failure.
+ */
+PHP_FUNCTION(http_get_request_body_stream)
+{
+ php_stream *s;
+
+ NO_ARGS;
+
+ if ((s = http_get_request_body_stream())) {
+ php_stream_to_zval(s, return_value);
+ } else {
+ http_error(HE_WARNING, HTTP_E_RUNTIME, "Failed to create request body stream");
+ RETURN_NULL();
+ }
+}
+/* }}} */
+
/* {{{ proto bool http_match_request_header(string header, string value[, bool match_case = false])
*
* Match an incoming HTTP header.