- allow to disable zlib support

[m6w6/ext-http] / http_functions.c

diff --git a/http_functions.c b/http_functions.c
index 7f7c4d68647ed9b37eae9a95612fe4f3c2a5d507..444637efe9f76403fb07bc03accbb42e8740f939 100644 (file)
--- a/http_functions.c
+++ b/http_functions.c
@@ -26,7 +26,7 @@
 #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
 
@@ -672,6 +672,7 @@ PHP_FUNCTION(http_redirect)
                RETURN_FALSE;
        }
 
+#ifdef HAVE_PHP_SESSION
        /* append session info */
        if (session) {
                if (!params) {
@@ -679,39 +680,13 @@ PHP_FUNCTION(http_redirect)
                        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) {
@@ -1462,7 +1437,7 @@ PHP_FUNCTION(http_request_method_unregister)
                        if (is_numeric_string(Z_STRVAL_P(method), Z_STRLEN_P(method), NULL, NULL, 1)) {
                                convert_to_long(method);
                        } else {
-                               ulong mn;
+                               int mn;
                                if (!(mn = http_request_method_exists(1, 0, Z_STRVAL_P(method)))) {
                                        RETURN_FALSE;
                                }
@@ -1505,7 +1480,7 @@ PHP_FUNCTION(http_request_method_exists)
                                        RETURN_LONG((long) http_request_method_exists(1, 0, Z_STRVAL_P(method)));
                                }
                        case IS_LONG:
-                               RETURN_LONG((long) http_request_method_exists(0, Z_LVAL_P(method), NULL));
+                               RETURN_LONG((long) http_request_method_exists(0, (int) Z_LVAL_P(method), NULL));
                        default:
                                RETURN_FALSE;
                }
@@ -1530,7 +1505,7 @@ PHP_FUNCTION(http_request_method_name)
                        RETURN_FALSE;
                }
 
-               RETURN_STRING(estrdup(http_request_method_name((ulong) method)), 0);
+               RETURN_STRING(estrdup(http_request_method_name((int) method)), 0);
        }
 }
 /* }}} */