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

diff --git a/http_functions.c b/http_functions.c
index 444637e..69f03e1 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,21 +636,23 @@ 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			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.
  * 
@@ -665,7 +667,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 = 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, &params, &session, &status) != SUCCESS) {
@@ -706,12 +708,12 @@ 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")) {
+		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);
 		}
 	}
@@ -724,7 +726,36 @@ PHP_FUNCTION(http_redirect)
 		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));
 }
 /* }}} */