- http_redirect(): proper check for ext/session; fix possible mem-leaks

[m6w6/ext-http] / http_functions.c

diff --git a/http_functions.c b/http_functions.c
index 7612013c070aca40fb1c63f6c5bc14b28b547ea6..1a1c8715c0d2a41a402fbc562644837ac778c67f 100644 (file)
--- a/http_functions.c
+++ b/http_functions.c
@@ -23,8 +23,10 @@
 #include "SAPI.h"
 #include "php_ini.h"
 #include "ext/standard/info.h"
-#include "ext/session/php_session.h"
 #include "ext/standard/php_string.h"
+#if defined(HAVE_PHP_SESSION) && !defined(COMPILE_DL_SESSION)
+#      include "ext/session/php_session.h"
+#endif
 
 #include "php_http.h"
 #include "php_http_std_defs.h"
@@ -202,7 +204,7 @@ PHP_FUNCTION(http_send_status)
                RETURN_FALSE;
        }
        if (status < 100 || status > 510) {
-               http_error_ex(E_WARNING, HTTP_E_HEADER, "Invalid HTTP status code (100-510): %d", status);
+               http_error_ex(HE_WARNING, HTTP_E_HEADER, "Invalid HTTP status code (100-510): %d", status);
                RETURN_FALSE;
        }
 
@@ -457,7 +459,7 @@ PHP_FUNCTION(http_redirect)
 {
        int url_len;
        size_t query_len = 0;
-       zend_bool session = 0, permanent = 0;
+       zend_bool session = 0, permanent = 0, free_params = 0;
        zval *params = NULL;
        char *query = NULL, *url = NULL, *URI,
                LOC[HTTP_URI_MAXLEN + sizeof("Location: ")],
@@ -468,19 +470,56 @@ PHP_FUNCTION(http_redirect)
        }
 
        /* append session info */
-       if (session && (PS(session_status) == php_session_active)) {
+       if (session) {
                if (!params) {
+                       free_params = 1;
                        MAKE_STD_ZVAL(params);
                        array_init(params);
                }
-               if (add_assoc_string(params, PS(session_name), PS(id), 1) != SUCCESS) {
-                       http_error(E_WARNING, HTTP_E_ENCODE, "Could not append session information");
+#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
        }
 
        /* treat params array with http_build_query() */
        if (params) {
                if (SUCCESS != http_urlencode_hash_ex(Z_ARRVAL_P(params), 0, NULL, 0, &query, &query_len)) {
+                       if (free_params) {
+                               zval_dtor(params);
+                               FREE_ZVAL(params);
+                       }
+                       if (query) {
+                               efree(query);
+                       }
                        RETURN_FALSE;
                }
        }
@@ -490,15 +529,24 @@ PHP_FUNCTION(http_redirect)
        if (query_len) {
                snprintf(LOC, HTTP_URI_MAXLEN + sizeof("Location: "), "Location: %s?%s", URI, query);
                sprintf(RED, "Redirecting to <a href=\"%s?%s\">%s?%s</a>.\n", URI, query, URI, query);
-               efree(query);
        } else {
                snprintf(LOC, HTTP_URI_MAXLEN + sizeof("Location: "), "Location: %s", URI);
                sprintf(RED, "Redirecting to <a href=\"%s\">%s</a>.\n", URI, URI);
        }
+       
        efree(URI);
+       if (query) {
+               efree(query);
+       }
+       if (free_params) {
+               zval_dtor(params);
+               FREE_ZVAL(params);
+       }
 
-       if ((SUCCESS == http_send_header(LOC)) && (SUCCESS == http_send_status((permanent ? 301 : 302)))) {
-               php_body_write(RED, strlen(RED) TSRMLS_CC);
+       if ((SUCCESS == http_send_header_string(LOC)) && (SUCCESS == http_send_status((permanent ? 301 : 302)))) {
+               if (SG(request_info).request_method && strcmp(SG(request_info).request_method, "HEAD")) {
+                       PHPWRITE(RED, strlen(RED));
+               }
                RETURN_TRUE;
        }
        RETURN_FALSE;
@@ -618,7 +666,6 @@ PHP_FUNCTION(http_split_response)
        array_init(zheaders);
 
        if (SUCCESS != http_split_response(response, response_len, Z_ARRVAL_P(zheaders), &body, &body_len)) {
-               http_error(E_WARNING, HTTP_E_PARSE, "Could not parse HTTP response");
                RETURN_FALSE;
        }
 
@@ -642,7 +689,6 @@ PHP_FUNCTION(http_parse_headers)
 
        array_init(return_value);
        if (SUCCESS != http_parse_headers(header, return_value)) {
-               http_error(E_WARNING, HTTP_E_PARSE, "Could not parse HTTP headers");
                zval_dtor(return_value);
                RETURN_FALSE;
        }
@@ -674,7 +720,7 @@ PHP_FUNCTION(http_get_request_body)
        NO_ARGS;
 
        if (SUCCESS == http_get_request_body(&body, &length)) {
-               RETURN_STRING(body, (int) length, 0);
+               RETURN_STRINGL(body, (int) length, 0);
        } else {
                RETURN_NULL();
        }
@@ -689,7 +735,7 @@ PHP_FUNCTION(http_match_request_header)
 {
        char *header, *value;
        int header_len, value_len;
-       zend_bool match_case = 0, result = 0;
+       zend_bool match_case = 0;
 
        if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|b", &header, &header_len, &value, &value_len, &match_case)) {
                RETURN_FALSE;
@@ -737,7 +783,6 @@ PHP_FUNCTION(http_match_request_header)
  *  - timeout:          int, seconds the request may take
  *  - connecttimeout:   int, seconds the connect may take
  *  - onprogress:       mixed, progress callback
- *  - ondebug:          mixed, debug callback
  * </pre>
  *
  * The optional third parameter will be filled with some additional information
@@ -1228,7 +1273,7 @@ PHP_FUNCTION(http_build_query)
        }
 
        if (Z_TYPE_P(formdata) != IS_ARRAY && Z_TYPE_P(formdata) != IS_OBJECT) {
-               http_error(E_WARNING, HTTP_E_PARAM, "Parameter 1 expected to be Array or Object.  Incorrect value given.");
+               http_error(HE_WARNING, HTTP_E_INVALID_PARAM, "Parameter 1 expected to be Array or Object.  Incorrect value given.");
                RETURN_FALSE;
        }
 
@@ -1255,7 +1300,6 @@ PHP_FUNCTION(http_build_query)
 
 PHP_FUNCTION(http_test)
 {
-       RETURN_NULL();
 }
 
 /*
@@ -1266,3 +1310,4 @@ PHP_FUNCTION(http_test)
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
  */
+