- improve http_redirect()

diff --git a/http_api.c b/http_api.c
index edd80aeec36cc3087b3facd79114da9cc7af7cd0..7825ebdd353ebd57aaf3098577d1bff821106e66 100644 (file)
--- a/http_api.c
+++ b/http_api.c
@@ -254,6 +254,7 @@ STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header
                case 301:       http_log(HTTP_G(log).redirect, "301-REDIRECT", header);                 break;
                case 302:       http_log(HTTP_G(log).redirect, "302-REDIRECT", header);                 break;
                case 303:       http_log(HTTP_G(log).redirect, "303-REDIRECT", header);                 break;
+               case 305:       http_log(HTTP_G(log).redirect, "305-REDIRECT", header);                 break;
                case 307:       http_log(HTTP_G(log).redirect, "307-REDIRECT", header);                 break;
                case 304:       http_log(HTTP_G(log).cache, "304-CACHE", header);                               break;
                case 405:       http_log(HTTP_G(log).allowed_methods, "405-ALLOWED", header);   break;

diff --git a/http_functions.c b/http_functions.c
index cbf9ad657d69c28a6b3a1170856c98e5ec988a65..69f03e17a4d75ff0b7582800ec18fc015e3fc8c5 100644 (file)
--- a/http_functions.c
+++ b/http_functions.c
@@ -642,10 +642,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 +667,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, &params, &session, &status) != SUCCESS) {
@@ -707,10 +708,14 @@ PHP_FUNCTION(http_redirect)
 
        if (query_len) {
                spprintf(&LOC, 0, "Location: %s?%s", URI, query);
-               spprintf(&RED, 0, "Redirecting to <a href=\"%s?%s\">%s?%s</a>.\n", URI, query, URI, query);
+               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);
-               spprintf(&RED, 0, "Redirecting to <a href=\"%s\">%s</a>.\n", URI, URI);
+               if (status != 300) {
+                       spprintf(&RED, 0, "Redirecting to <a href=\"%s\">%s</a>.\n", URI, URI);
+               }
        }
        
        efree(URI);
@@ -722,11 +727,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));
 }

diff --git a/http_response_object.c b/http_response_object.c
index 87d3e630137f0ad7205a6761c3e5d8792de70018..eda4e763cf520e964b9a1a925cb18d5e6a7b5818 100644 (file)
--- a/http_response_object.c
+++ b/http_response_object.c
@@ -230,7 +230,9 @@ static inline void _http_response_object_declare_default_properties(TSRMLS_D)
 #ifndef WONKY
        DCL_CONST(long, "REDIRECT", HTTP_REDIRECT);
        DCL_CONST(long, "REDIRECT_PERM", HTTP_REDIRECT_PERM);
+       DCL_CONST(long, "REDIRECT_FOUND", HTTP_REDIRECT_FOUND);
        DCL_CONST(long, "REDIRECT_POST", HTTP_REDIRECT_POST);
+       DCL_CONST(long, "REDIRECT_PROXY", HTTP_REDIRECT_PROXY);
        DCL_CONST(long, "REDIRECT_TEMP", HTTP_REDIRECT_TEMP);
 #endif /* WONKY */
 }

diff --git a/http_send_api.c b/http_send_api.c
index fb25f40a8adb65fad443bc6ce50b39a9ee338178..62660359026f03581012666a8a1add9101dae87a 100644 (file)
--- a/http_send_api.c
+++ b/http_send_api.c
@@ -179,9 +179,10 @@ static inline void _http_send_response_finish(void **buffer TSRMLS_DC)
 PHP_MINIT_FUNCTION(http_send)
 {
        HTTP_LONG_CONSTANT("HTTP_REDIRECT", HTTP_REDIRECT);
-       HTTP_LONG_CONSTANT("HTTP_REDIRECT_AUTO", HTTP_REDIRECT_AUTO);
        HTTP_LONG_CONSTANT("HTTP_REDIRECT_PERM", HTTP_REDIRECT_PERM);
+       HTTP_LONG_CONSTANT("HTTP_REDIRECT_FOUND", HTTP_REDIRECT_FOUND);
        HTTP_LONG_CONSTANT("HTTP_REDIRECT_POST", HTTP_REDIRECT_POST);
+       HTTP_LONG_CONSTANT("HTTP_REDIRECT_PROXY", HTTP_REDIRECT_PROXY);
        HTTP_LONG_CONSTANT("HTTP_REDIRECT_TEMP", HTTP_REDIRECT_TEMP);
        
        return SUCCESS;

diff --git a/php_http_send_api.h b/php_http_send_api.h
index ff4e2c0d3c319bfc6b3939db17de871605853a7f..aef44909d8ca22f24eb4b7562143da84710eccec 100644 (file)
--- a/php_http_send_api.h
+++ b/php_http_send_api.h
@@ -20,10 +20,11 @@ typedef enum {
        SEND_RSRC
 } http_send_mode;
 
-#define HTTP_REDIRECT          302L
-#define HTTP_REDIRECT_AUTO       0L
+#define HTTP_REDIRECT            0L
 #define HTTP_REDIRECT_PERM     301L
+#define HTTP_REDIRECT_FOUND    302L
 #define HTTP_REDIRECT_POST     303L
+#define HTTP_REDIRECT_PROXY    305L
 #define HTTP_REDIRECT_TEMP     307L
 
 extern PHP_MINIT_FUNCTION(http_send);