Revert last commit. Last patch has problem for the 1st request.

# I also found what's wrong in mod_mm.c  :)
# I'll fix it later since don't have much time now.

diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c
index ce6365365e7a82f4489c6323e71c765517dacb7a..96f0c3a93ebd9e9bb46f9877776bed79f8a18c5b 100644 (file)
--- a/ext/session/mod_files.c
+++ b/ext/session/mod_files.c
@@ -123,7 +123,7 @@ static void ps_files_close(ps_files *data)
        }
 }
 
-static int ps_files_open(ps_files *data, const char *key)
+static void ps_files_open(ps_files *data, const char *key)
 {
        char buf[MAXPATHLEN];
        TSRMLS_FETCH();
@@ -138,7 +138,7 @@ static int ps_files_open(ps_files *data, const char *key)
                
                if (!ps_files_valid_key(key) || 
                                !ps_files_path_create(buf, sizeof(buf), data, key))
-                       return FAILURE;
+                       return;
                
                data->lastkey = estrdup(key);
                
@@ -153,13 +153,10 @@ static int ps_files_open(ps_files *data, const char *key)
                if (data->fd != -1) 
                        flock(data->fd, LOCK_EX);
 
-               if (data->fd == -1) {
+               if (data->fd == -1)
                        php_error(E_WARNING, "open(%s, O_RDWR) failed: %s (%d)", buf, 
                                        strerror(errno), errno);
-                       return FAILURE;
-               }
        }
-       return SUCCESS;
 }
 
 static int ps_files_cleanup_dir(const char *dirname, int maxlifetime)
@@ -257,9 +254,7 @@ PS_READ_FUNC(files)
        struct stat sbuf;
        PS_FILES_DATA;
 
-       if (ps_files_open(data, key) == FAILURE)
-               return FAILURE;
-       
+       ps_files_open(data, key);
        if (data->fd < 0)
                return FAILURE;
        
@@ -288,9 +283,7 @@ PS_WRITE_FUNC(files)
        long n;
        PS_FILES_DATA;
 
-       if (ps_files_open(data, key) == FAILURE)
-               return FAILURE;
-
+       ps_files_open(data, key);
        if (data->fd < 0)
                return FAILURE;
 

diff --git a/ext/session/session.c b/ext/session/session.c
index 0594d916c10010eda9e177d26fd75f724cf984c5..69836bff5309ae28b4a0b573ae8f756f0ed981b8 100644 (file)
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -543,21 +543,19 @@ static char *_php_create_id(int *newlen TSRMLS_DC)
        return estrdup(buf);
 }
 
-static int php_session_initialize(TSRMLS_D)
+static void php_session_initialize(TSRMLS_D)
 {
        char *val;
        int vallen;
        
        if (PS(mod)->open(&PS(mod_data), PS(save_path), PS(session_name)) == FAILURE) {
                php_error(E_ERROR, "Failed to initialize session module");
-               return FAILURE;
+               return;
        }
-       if (PS(mod)->read(&PS(mod_data), PS(id), &val, &vallen) == FAILURE) {
-               return FAILURE;
+       if (PS(mod)->read(&PS(mod_data), PS(id), &val, &vallen) == SUCCESS) {
+               php_session_decode(val, vallen TSRMLS_CC);
+               efree(val);
        }
-       php_session_decode(val, vallen TSRMLS_CC);
-       efree(val);
-       return SUCCESS;
 }
 
 
@@ -948,10 +946,11 @@ static void php_session_start(TSRMLS_D)
        }
 
        php_session_cache_limiter(TSRMLS_C);
-       if (php_session_initialize(TSRMLS_C) == SUCCESS && 
-               PS(mod_data) && PS(gc_probability) > 0) {
+       php_session_initialize(TSRMLS_C);
+
+       if (PS(mod_data) && PS(gc_probability) > 0) {
                int nrdels = -1;
-               
+
                nrand = (int) (100.0*php_combined_lcg(TSRMLS_C));
                if (nrand < PS(gc_probability)) {
                        PS(mod)->gc(&PS(mod_data), PS(gc_maxlifetime), &nrdels);
@@ -963,7 +962,6 @@ static void php_session_start(TSRMLS_D)
        }
 }
 
-
 static zend_bool php_session_destroy(TSRMLS_D)
 {
        zend_bool retval = SUCCESS;