cvs: php4 /ext/msession php_msession.h reqclient.h

mlwmohawk Fri Dec 21 21:10:42 2001 EDT Modified files: /php4/ext/msession php_msession.h reqclient.h Log: Added msession_call Index: php4/ext/msession/php_msession.h diff -u php4/ext/msession/php_msession.h:1.4 php4/ext/msession/php_msession.h:1.5 --- php4/ext/msession/php_msession.h:1.4 Tue Dec 11 10:29:55 2001 +++ php4/ext/msession/php_msession.h Fri Dec 21 21:10:42 2001 @@ -1,8 +1,8 @@ /* +----------------------------------------------------------------------+ - | PHP Version 4 | + | PHP version 4.x | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2002 The PHP Group | + | Copyright (c) 1997, 1998, 1999, 2000, 2001 The PHP Group | +----------------------------------------------------------------------+ | 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 | @@ -40,7 +40,6 @@ PHP_RSHUTDOWN_FUNCTION(msession); PHP_MINFO_FUNCTION(msession); -PHP_FUNCTION(confirm_msession_compiled); /* For testing, remove later. */ PHP_FUNCTION(msession_connect); PHP_FUNCTION(msession_disconnect); PHP_FUNCTION(msession_lock); @@ -62,6 +61,7 @@ PHP_FUNCTION(msession_uniq); PHP_FUNCTION(msession_randstr); PHP_FUNCTION(msession_plugin); +PHP_FUNCTION(msession_call); /* Declare any global variables you may need between the BEGIN Index: php4/ext/msession/reqclient.h diff -u php4/ext/msession/reqclient.h:1.6 php4/ext/msession/reqclient.h:1.7 --- php4/ext/msession/reqclient.h:1.6 Tue Dec 11 10:29:55 2001 +++ php4/ext/msession/reqclient.h Fri Dec 21 21:10:42 2001 @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | msession 1.0 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2002 The PHP Group | + | Copyright (c) 1997-2001 The PHP Group | +----------------------------------------------------------------------+ | 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 | @@ -17,6 +17,19 @@ +----------------------------------------------------------------------+ */ +/* +-------------------------------------------------------------------------- + These are definitions are pulled from Phoenix. + It would probably be easier to maintain one file, + but some phoenix header files conflict with other + project header files common to PHP. Besides, this + allows this header to be PHP license and Phoenix to + be LGPL with no conflicts. + + MAKE NO CHANGES TO THIS FILE IT. MUST REMAIN CONSTANT + WITH PHOENIX OR IT WILL NOT WORK. +-------------------------------------------------------------------------- +*/ enum REQ_TYPES { REQ_ERR, @@ -41,10 +54,30 @@ REQ_UNIQ, REQ_RANDSTR, REQ_PLUGIN, + REQ_CALL, REQ_LAST, REQ_POPEN=1024, REQ_PCLOSE }; +enum REQ_ERRORS +{ + REQE_NOERROR=0, + REQE_NOSESSION, + REQE_DUPSESSION, + REQE_NOWLOCK, + REQE_NOVALUE, + REQE_LOCKED, + REQE_NOSEND, + REQE_NOCONNECT, + REQE_BADCONN, + REQE_BADHDR, + REQE_BADVER, + REQE_BADLEN, + REQE_BUFFER, + REQE_DENIED, + REQE_NOFN, + REQE_UNKNOWN +}; typedef struct _requestPacket { @@ -86,6 +119,7 @@ int FormatRequest(REQB **buffer, int stat, const char *session, const char *name, const char *value, int param); int FormatRequestMulti(REQB **buffer, int stat, char *session, int n, char **pairs, int param); +int FormatRequestStrings(REQB **ppreq, int stat, char *session, int n, char **strings); int DoSingleRequest(char *hostname, int port, REQB **preq); void *OpenReqConn(char *hostname, int port); void CloseReqConn(void *conn);