Cleanup and clarify

diff --git a/ext/session/php_session.h b/ext/session/php_session.h
index f6ee4f7324d4b310bf0004f8777430c2f7cbc427..b3d9e06c432adc8c75f6b445badb3f54531c76f2 100644 (file)
--- a/ext/session/php_session.h
+++ b/ext/session/php_session.h
@@ -88,7 +88,6 @@ typedef struct _php_ps_globals {
        const struct ps_serializer_struct *serializer;
        zval *http_session_vars;
        zend_bool auto_start;
-       zend_bool define_sid;
        zend_bool use_cookies;
        zend_bool use_trans_sid;
        zend_bool output_handler_registered;

diff --git a/ext/session/session.c b/ext/session/session.c
index e21363331b7382600820f3cd538076943229e238..e41163ea8ff42bafe348e5049a74faa549c6dea1 100644 (file)
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -809,6 +809,7 @@ static void php_session_start(TSRMLS_D)
        int module_number = PS(module_number);
        int nrand;
        int lensess;
+       int register_trans_sid_handler = PS(use_trans_sid);
 
        if (PS(session_status) != php_session_none) 
                return;
@@ -828,7 +829,7 @@ static void php_session_start(TSRMLS_D)
                                zend_hash_find(Z_ARRVAL_PP(data), PS(session_name),
                                        lensess + 1, (void **) &ppid) == SUCCESS) {
                        PPID2SID;
-                       PS(define_sid) = 0;
+                       register_trans_sid_handler = 0;
                        send_cookie = 0;
                }
 
@@ -883,14 +884,14 @@ static void php_session_start(TSRMLS_D)
                efree(PS(id));
                PS(id) = NULL;
                send_cookie = 1;
-               PS(define_sid) = 1;
+               register_trans_sid_handler = 1;
        }
        
        if (!PS(id))
                PS(id) = _php_create_id(NULL TSRMLS_CC);
        
        if (!PS(use_cookies) && send_cookie) {
-               PS(define_sid) = 1;
+               register_trans_sid_handler = 1;
                send_cookie = 0;
        }
        
@@ -899,7 +900,7 @@ static void php_session_start(TSRMLS_D)
        }
 
 
-       if (PS(define_sid)) {
+       if (register_trans_sid_handler) {
                smart_str var = {0};
 
                smart_str_appends(&var, PS(session_name));
@@ -912,7 +913,7 @@ static void php_session_start(TSRMLS_D)
        }
 
        PS(session_status) = php_session_active;
-       if (PS(define_sid) && PS(use_trans_sid)) {
+       if (register_trans_sid_handler) {
                php_session_start_output_handler(4096 TSRMLS_CC);
        }
 
@@ -1312,12 +1313,6 @@ PHP_FUNCTION(session_destroy)
 }
 /* }}} */
 
-void session_adapt_url(const char *url, size_t urllen, char **new, size_t *newlen TSRMLS_DC)
-{
-       if (PS(define_sid) && (PS(session_status) == php_session_active)) {
-               *new = url_adapt_single_url(url, urllen, PS(session_name), PS(id), newlen TSRMLS_CC);
-       }
-}
 
 /* {{{ proto void session_unset(void)
    Unset all registered variables */
@@ -1346,7 +1341,6 @@ PHP_FUNCTION(session_unset)
 static void php_rinit_session_globals(TSRMLS_D)
 {              
        zend_hash_init(&PS(vars), 0, NULL, NULL, 0);
-       PS(define_sid) = 0;
        PS(id) = NULL;
        PS(session_status) = php_session_none;
        PS(mod_data) = NULL;