MSession now works with the new MCache server

1 files changed, 20 insertions, 26 deletions

diff --git a/ext/msession/php_msession.h b/ext/msession/php_msession.h
index b41df742f6..976bb9de2a 100644
--- a/ext/msession/php_msession.h
+++ b/ext/msession/php_msession.h
@@ -2,12 +2,12 @@
    +----------------------------------------------------------------------+
    | msession 1.0                                                         |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2006 The PHP Group                                |
+   | Copyright (c) 1997-2003 The PHP Group                                |
    +----------------------------------------------------------------------+
-   | This source file is subject to version 3.01 of the PHP license,      |
+   | This source file is subject to version 2.02 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
-   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_01.txt                                  |
+   | available at through the world-wide-web at                           |
+   | http://www.php.net/license/2_02.txt.                                 |
    | If you did not receive a copy of the PHP license and are unable to   |
    | obtain it through the world-wide-web, please send a note to          |
    | license@php.net so we can mail you a copy immediately.               |
@@ -35,6 +35,9 @@ extern zend_module_entry msession_module_entry;
 #endif
 
 PHP_MINIT_FUNCTION(msession);
+PHP_MSHUTDOWN_FUNCTION(msession);
+PHP_RINIT_FUNCTION(msession);
+PHP_RSHUTDOWN_FUNCTION(msession);
 PHP_MINFO_FUNCTION(msession);
 
 PHP_FUNCTION(msession_connect);
@@ -45,50 +48,41 @@ PHP_FUNCTION(msession_ctl);
 PHP_FUNCTION(msession_count);
 PHP_FUNCTION(msession_create);
 PHP_FUNCTION(msession_destroy);
-PHP_FUNCTION(msession_exec);
 PHP_FUNCTION(msession_set);
 PHP_FUNCTION(msession_get);
 PHP_FUNCTION(msession_find);
 PHP_FUNCTION(msession_get_array);
+PHP_FUNCTION(msession_save_object);
+PHP_FUNCTION(msession_get_object);
 PHP_FUNCTION(msession_set_array);
 PHP_FUNCTION(msession_timeout);
 PHP_FUNCTION(msession_inc);
-PHP_FUNCTION(msession_set_data);
-PHP_FUNCTION(msession_get_data);
+PHP_FUNCTION(msession_add);
+PHP_FUNCTION(msession_muldiv);
+PHP_FUNCTION(msession_setdata);
+PHP_FUNCTION(msession_getdata);
 PHP_FUNCTION(msession_listvar);
 PHP_FUNCTION(msession_list);
 PHP_FUNCTION(msession_uniq);
 PHP_FUNCTION(msession_randstr);
 PHP_FUNCTION(msession_plugin);
 PHP_FUNCTION(msession_call);
-PHP_FUNCTION(msession_ping);
-
-/* 
-  	Declare any global variables you may need between the BEGIN
-	and END macros here:     
+PHP_FUNCTION(msession_find_cacheid);
+PHP_FUNCTION(msession_set_cacheid);
 
 ZEND_BEGIN_MODULE_GLOBALS(msession)
-	int global_variable;
-	void *conn;
+	int   port;
 	char *host;
+	void *conn;
+	void *reqb;
 ZEND_END_MODULE_GLOBALS(msession)
 
-*/
-/* In every function that needs to use variables in php_msession_globals,
-   do call MSESSIONLS_FETCH(); after declaring other variables used by
-   that function, and always refer to them as MSESSIONG(variable).
-   You are encouraged to rename these macros something shorter, see
-   examples in any other php module directory.
-*/
 
 #ifdef ZTS
-#define MSESSIONG(v) (msession_globals->v)
-#define MSESSIONLS_FETCH() php_msession_globals *msession_globals = ts_resource(msession_globals_id)
+#define MSESSION_G(v) TSRMG(msession_globals_id, zend_msession_globals *, v)
 #else
-#define MSESSIONG(v) (msession_globals.v)
-#define MSESSIONLS_FETCH()
+#define MSESSION_G(v) (msession_globals.v)
 #endif
-
 #else
 
 #define phpext_msession_ptr NULL