| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2005, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2006, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
#include "ext/standard/php_string.h"
#include "zend_operators.h"
-#if defined(HAVE_PHP_SESSION) && !defined(COMPILE_DL_SESSION)
+#ifdef HAVE_PHP_SESSION
# include "ext/session/php_session.h"
#endif
*
* Redirect to the given url.
*
- * The supplied url will be expanded with http_build_uri(), the params array will
+ * The supplied url will be expanded with http_build_url(), the params array will
* be treated with http_build_query() and the session identification will be appended
* if session is true.
*
* 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 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
* for which redirect response code to use in which situation.
*
- * To be RFC compliant, "Redirecting to <a>URI</a>." will be displayed,
+ * To be RFC compliant, "Redirecting to <a>URL</a>." will be displayed,
* if the client doesn't redirect immediatly, and the request method was
* another one than HEAD.
*
size_t query_len = 0;
zend_bool session = 0, free_params = 0;
zval *params = NULL;
- long status = 302;
+ 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) {
RETURN_FALSE;
}
+#ifdef HAVE_PHP_SESSION
/* append session info */
if (session) {
if (!params) {
MAKE_STD_ZVAL(params);
array_init(params);
}
-#ifdef HAVE_PHP_SESSION
-# ifdef COMPILE_DL_SESSION
- if (SUCCESS == zend_get_module_started("session")) {
- zval nm_retval, id_retval, func;
-
- INIT_PZVAL(&func);
- INIT_PZVAL(&nm_retval);
- INIT_PZVAL(&id_retval);
- ZVAL_NULL(&nm_retval);
- ZVAL_NULL(&id_retval);
-
- ZVAL_STRINGL(&func, "session_id", lenof("session_id"), 0);
- call_user_function(EG(function_table), NULL, &func, &id_retval, 0, NULL TSRMLS_CC);
- ZVAL_STRINGL(&func, "session_name", lenof("session_name"), 0);
- call_user_function(EG(function_table), NULL, &func, &nm_retval, 0, NULL TSRMLS_CC);
-
- if ( Z_TYPE(nm_retval) == IS_STRING && Z_STRLEN(nm_retval) &&
- Z_TYPE(id_retval) == IS_STRING && Z_STRLEN(id_retval)) {
- if (add_assoc_stringl_ex(params, Z_STRVAL(nm_retval), Z_STRLEN(nm_retval)+1,
- Z_STRVAL(id_retval), Z_STRLEN(id_retval), 0) != SUCCESS) {
- http_error(HE_WARNING, HTTP_E_RUNTIME, "Could not append session information");
- }
- }
- }
-# else
if (PS(session_status) == php_session_active) {
if (add_assoc_string(params, PS(session_name), PS(id), 1) != SUCCESS) {
http_error(HE_WARNING, HTTP_E_RUNTIME, "Could not append session information");
}
}
-# endif
-#endif
}
+#endif
/* treat params array with http_build_query() */
if (params) {
if (query_len) {
spprintf(&LOC, 0, "Location: %s?%s", URI, query);
- if (SG(request_info).request_method && strcmp(SG(request_info).request_method, "HEAD")) {
+ if (status != 300) {
spprintf(&RED, 0, "Redirecting to <a href=\"%s?%s\">%s?%s</a>.\n", URI, query, URI, query);
}
} else {
spprintf(&LOC, 0, "Location: %s", URI);
- if (SG(request_info).request_method && strcmp(SG(request_info).request_method, "HEAD")) {
+ if (status != 300) {
spprintf(&RED, 0, "Redirecting to <a href=\"%s\">%s</a>.\n", URI, URI);
}
}
zval_dtor(params);
FREE_ZVAL(params);
}
-
+
+ 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;
+ }
+
RETURN_SUCCESS(http_exit_ex(status, LOC, RED, 1));
}
/* }}} */
*
* 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)
{
}
/* }}} */
+/* {{{ 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.
projects / m6w6 / ext-http / blobdiff