X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_functions.c;h=aae091d691a543c6846ea6a83d4c090cf34c073e;hp=444637efe9f76403fb07bc03accbb42e8740f939;hb=fa1a275e2b5e1b9dfb5bcbf97b51ef2b568e433c;hpb=bbb3e0cfaf7e884c82fc42e873e47d0e6024e1b6

diff --git a/http_functions.c b/http_functions.c
index 444637e..aae091d 100644
--- a/http_functions.c
+++ b/http_functions.c
@@ -6,7 +6,7 @@
     | 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>            |
     +--------------------------------------------------------------------+
 */
 
@@ -636,13 +636,14 @@ PHP_FUNCTION(http_throttle)
  *
  * 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_AUTO	303 See Other for POST, else 302 Found
  *  - HTTP_REDIRECT_PERM	301 Moved Permanently
  *  - HTTP_REDIRECT_POST	303 See Other
  *  - HTTP_REDIRECT_TEMP	307 Temporary Redirect
@@ -650,7 +651,7 @@ PHP_FUNCTION(http_throttle)
  * 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.
  * 
@@ -665,7 +666,7 @@ PHP_FUNCTION(http_redirect)
 	size_t query_len = 0;
 	zend_bool session = 0, free_params = 0;
 	zval *params = NULL;
-	long status = 302;
+	long status = 0;
 	char *query = NULL, *url = NULL, *URI, *LOC, *RED = NULL;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sa!/bl", &url, &url_len, &params, &session, &status) != SUCCESS) {
@@ -706,14 +707,10 @@ PHP_FUNCTION(http_redirect)
 
 	if (query_len) {
 		spprintf(&LOC, 0, "Location: %s?%s", URI, query);
-		if (SG(request_info).request_method && strcmp(SG(request_info).request_method, "HEAD")) {
-			spprintf(&RED, 0, "Redirecting to <a href=\"%s?%s\">%s?%s</a>.\n", URI, query, URI, query);
-		}
+		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")) {
-			spprintf(&RED, 0, "Redirecting to <a href=\"%s\">%s</a>.\n", URI, URI);
-		}
+		spprintf(&RED, 0, "Redirecting to <a href=\"%s\">%s</a>.\n", URI, URI);
 	}
 	
 	efree(URI);