Changeset 258

Timestamp:

07/30/06 16:35:03 (2 years ago)

Author:

bart

Message:

Clean up the session handler, removed old code for php < 4.3.

Files:

• eaccelerator/trunk/ChangeLog (modified) (1 diff)
• eaccelerator/trunk/config.m4 (modified) (3 diffs)
• eaccelerator/trunk/doc/php/session.php (deleted)
• eaccelerator/trunk/eaccelerator.c (modified) (3 diffs)
• eaccelerator/trunk/session.c (modified) (4 diffs)
• eaccelerator/trunk/session.h (modified) (1 diff)

eaccelerator/trunk/ChangeLog

@@ -9 +9 @@
-                * Remove some leftovers from restoring encoded scripts which only create
-                  overhead without the loader.
+        * Clean up the session handler, removed old code for php < 4.3. 
-                  
-2006-07-29  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>

eaccelerator/trunk/config.m4

@@ -107 +107 @@
-    AC_DEFINE(WITH_EACCELERATOR_INFO, 1, [Define if you want the information functions])
-  fi
-  if test "$eaccelerator_sessions" = "yes"; then
-    AC_DEFINE(WITH_EACCELERATOR_SESSIONS, 1, [Define if you like to use eAccelerator session handlers to store session's information in shared memory])
-  fi
-  if test "$eaccelerator_content_caching" = "yes"; then
-    AC_DEFINE(WITH_EACCELERATOR_CONTENT_CACHING, 1, [Define if you like to use eAccelerator content cachin API])
@@ -138 +135 @@
-#include <sys/types.h>],msg=yes,msg=no)
-  AC_MSG_RESULT([$msg])
+
+  old_cppflags="$CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS $INCLUDES -I$abs_srcdir"
+  AC_MSG_CHECKING(for ext/session/php_session.h)
+  AC_TRY_CPP([#include "ext/session/php_session.h"],msg="yes",msg="no")
+  if test "$msg" = "yes"; then
+    AC_DEFINE(HAVE_EXT_SESSION_PHP_SESSION_H, 1, [Define if you have the <ext/session/php_session.h> header file.])
+  fi
+  AC_MSG_RESULT([$msg])
+  CPPFLAGS="$old_cppflags"
+  if test "$msg" = "yes" && test "$eaccelerator_sessions" = "yes"; then
+    AC_DEFINE(WITH_EACCELERATOR_SESSIONS, 1, [Define if you like to use eAccelerator session handlers to store session's information in shared memory])
+  elif test "$eaccelerator_sessions" = "yes"; then
+    AC_MSG_ERROR("Can't compile eAccelerator with session support if php isn't compiled with session support!")
+  fi
+
-
-  AC_MSG_CHECKING(whether union semun is defined in sys/sem.h)
@@ -326 +339 @@
-      AC_DEFINE(HAVE_MPROTECT, 1, [Define if ou have mprotect function])
-    ])
-
-  old_cppflags="$CPPFLAGS"
-  CPPFLAGS="$CPPFLAGS $INCLUDES -I$abs_srcdir"
-  AC_MSG_CHECKING(for ext/session/php_session.h)
-  AC_TRY_CPP([#include "ext/session/php_session.h"],msg="yes",msg="no")
-  if test "$msg" = "yes"; then
-    AC_DEFINE(HAVE_EXT_SESSION_PHP_SESSION_H, 1, [Define if you have the <ext/session/php_session.h> header file.])
-  fi
-  AC_MSG_RESULT([$msg])
-  CPPFLAGS="$old_cppflags"
-
-fi

eaccelerator/trunk/eaccelerator.c

@@ -1746 +1746 @@
-#endif
-  }
-
-
-
-
+
+
+
-#endif
-#ifdef WITH_EACCELERATOR_CONTENT_CACHING
@@ -1757 +1756 @@
-    register_eaccelerator_as_zend_extension();
-  }
+  
-#ifdef ZEND_ENGINE_2
-  /* cache the properties_info destructor */
@@ -1946 +1946 @@
-  PHP_FE(eaccelerator_removed_scripts, NULL)
-  PHP_FE(eaccelerator_list_keys, NULL)
-#endif
-#ifdef WITH_EACCELERATOR_SESSIONS
-#ifndef HAVE_PHP_SESSIONS_SUPPORT
-  PHP_FE(_eaccelerator_session_open, NULL)
-  PHP_FE(_eaccelerator_session_close, NULL)
-  PHP_FE(_eaccelerator_session_read, NULL)
-  PHP_FE(_eaccelerator_session_write, NULL)
-  PHP_FE(_eaccelerator_session_destroy, NULL)
-  PHP_FE(_eaccelerator_session_gc, NULL)
-#endif
-  PHP_FE(eaccelerator_set_session_handlers, NULL)
-#endif
-#ifdef WITH_EACCELERATOR_CONTENT_CACHING

eaccelerator/trunk/session.c

@@ -33 +33 @@
-#include "cache.h"
-#include "ext/standard/md5.h"
+#include "ext/standard/php_lcg.h"
-#include <fcntl.h>
-
-#ifdef WIN32
-#       include "win32/time.h"
-#endif
-
-#if defined(HAVE_PHP_SESSIONS_SUPPORT) && defined(PS_CREATE_SID_ARGS)
-#       include "ext/standard/php_lcg.h"
-#endif
-
@@ -93 +90 @@
-}
-
-#ifdef HAVE_PHP_SESSIONS_SUPPORT        /* PHP_SESSION_API >= 20020306 */
-/******************************************************************************/
-/* Session api functions                                                                                                          */
-/******************************************************************************/
-
-PS_OPEN_FUNC(eaccelerator)
-{
@@ -199 +194 @@
-}
-
-#ifdef PS_CREATE_SID_ARGS
-PS_CREATE_SID_FUNC(eaccelerator)
-{
@@ -262 +256 @@
-        return estrdup (buf);
-}
-#endif
-
-#else
-/******************************************************************************/
-/* PHP function to register as user session handlers when the session api         */
-/* available.                                                                                                                             */
-/******************************************************************************/
-
-PHP_FUNCTION(_eaccelerator_session_open)
-{
-        if (eaccelerator_mm_instance == NULL) {
-                RETURN_FALSE;
-        }
-        RETURN_TRUE;
-}
-
-PHP_FUNCTION(_eaccelerator_session_close)
-{
-        if (eaccelerator_mm_instance == NULL) {
-                RETURN_FALSE;
-        }
-        do_session_unlock(TSRMLS_C);
-        RETURN_TRUE;
-}
-
-PHP_FUNCTION(_eaccelerator_session_read)
-{
-        zval **arg_key;
-        char *key;
-        int len;
-
-        if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg_key) == FAILURE) {
-                WRONG_PARAM_COUNT;
-        }
-        len = sizeof("sess_") + Z_STRLEN_PP(arg_key);
-        key = do_alloca(len + 1);
-        strcpy(key, "sess_");
-        strcat(key, Z_STRVAL_PP(arg_key));
-        do_session_lock(key TSRMLS_CC);
-        if (eaccelerator_get(key, len, return_value, eaccelerator_sessions_cache_place TSRMLS_CC)) {
-                free_alloca(key);
-                return;
-        } else {
-                free_alloca(key);
-                RETURN_EMPTY_STRIN ();
-        }
-}
-
-PHP_FUNCTION(_eaccelerator_session_write)
-{
-        zval **arg_key, **arg_val;
-        char *key;
-        int len;
-        time_t ttl;
-
-        if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &arg_key, &arg_val) == FAILURE) {
-                WRONG_PARAM_COUNT;
-        }
-        len = sizeof("sess_") + Z_STRLEN_PP(arg_key);
-        key = do_alloca(len + 1);
-        strcpy(key, "sess_");
-        strcat(key, Z_STRVAL_PP(arg_key));
-        ttl = PS(gc_maxlifetime);
-        if (ttl < 0)
-                ttl = 1440;
-        do_session_lock(key TSRMLS_CC);
-        if (eaccelerator_put(key, len, *arg_val, ttl, eaccelerator_sessions_cache_place TSRMLS_CC)) {
-                free_alloca(key);
-                RETURN_TRUE;
-        } else {
-                free_alloca(key);
-                RETURN_FALSE;
-        }
-}
-
-PHP_FUNCTIO (_eaccelerator_session_destroy)
-{
-        zval **arg_key;
-        char *key;
-        int len;
-
-        if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex (1, &arg_key) == FAILURE) {
-                WRONG_PARAM_COUNT;
-        }
-        len = sizeof("sess_") + Z_STRLEN_PP(arg_key);
-        key = do_alloca(len + 1);
-        strcpy(key, "sess_");
-        strcat(key, Z_STRVAL_PP(arg_key));
-        if (eaccelerator_rm(key, len, eaccelerator_sessions_cache_place TSRMLS_CC)) {
-                free_alloca(key);
-                RETURN_TRUE;
-        } else {
-                free_alloca(key);
-                RETURN_FALSE;
-        }
-}
-
-PHP_FUNCTION(_eaccelerator_session_gc)
-{
-        if (eaccelerator_mm_instance == NULL) {
-                RETURN_FALSE;
-        }
-        eaccelerator_gc(TSRMLS_C);
-        RETURN_TRUE;
-}
-#endif /* ELSE HAVE_PHP_SESSIONS_SUPPORT */
-
-ps_module ps_mod_eaccelerator = {
-
-
-
-
-
+
-};
-
-/* is the eA registered as session handler */
-int eaccelerator_session_registered()
-{
-        return !(eaccelerator_sessions_cache_place != ea_none && eaccelerator_sessions_registered == 0);
-}
-
-/* register ea as session handler */
-void eaccelerator_register_session()
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-        }
-}

eaccelerator/trunk/session.h

@@ -31 +31 @@
-#include "php_ini.h"
-
-/* check if php is compiled with session support */
-#undef HAVE_PHP_SESSIONS_SUPPORT
-#if defined(HAVE_EXT_SESSION_PHP_SESSION_H)
-#       include "ext/session/php_session.h"
-#       if defined(PHP_SESSION_API) && PHP_SESSION_API >= 20020306
-#       define HAVE_PHP_SESSIONS_SUPPORT
-#       endif
-#else // no session support in php, undef eA session support
-#       undef WITH_EACCELERATOR_SESSIONS
-#endif
-
-#ifdef WITH_EACCELERATOR_SESSIONS
-
-
+
+
-int eaccelerator_session_registered();
-void eaccelerator_register_session();
-
-#ifdef HAVE_PHP_SESSIONS_SUPPORT
-PHP_FUNCTION(_eaccelerator_session_open);
-PHP_FUNCTION(_eaccelerator_session_close);
-PHP_FUNCTION(_eaccelerator_session_read);
-PHP_FUNCTION(_eaccelerator_session_write);
-PHP_FUNCTION(_eaccelerator_session_destroy);
-PHP_FUNCTION(_eaccelerator_session_gc);
-#endif
-PHP_FUNCTION(eaccelerator_set_session_handlers);
-PHP_INI_MH(eaccelerator_OnUpdateSessionCachePlace);
-