archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Sorry guys, PHP 4.0.6's ZEND_MODULE_API_NO is whacked, it has an extra

Browse source 
zero, thus ZEND_MODULE_API_NO >= xxxx, will not work for about 18000 years.
Added better checking, and cleaned up some of the #ifdef you seem to love
so much.
This commit is contained in:
Mark L. Woodward 2002-02-05 20:02:34 +00:00
parent 8b9b916ce9
commit a8013517f5
1 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

29
ext/msession/msession.c
View file

@ -46,6 +46,20 @@
/* Uncomment to get debugging messages */ /* Uncomment to get debugging messages */
/* #define ERR_DEBUG */ /* #define ERR_DEBUG */
/* Zend version number is out of whack in 4.0.6 */
/* Numerical <> do not seem to work, older released version is greater than current */
/* This sets the PHP API version used in the file. */
/* If this module does not compile on the version of PHP you are using, look for */
/* this value in Zend/zend_modules.h, and set appropriately */
#if (ZEND_MODULE_API_NO == 20001222)
#define PHP_4_0_API
#define TSRMLS_CC
#define TSRMLS_FETCH()
#elif (ZEND_MODULE_API_NO >= 20010901)
#define PHP_4_1_API
#endif
/* /*
* Please do not remove backward compatibility from this module. * Please do not remove backward compatibility from this module.
* this same source must also work with 4.0 versions of PHP. * this same source must also work with 4.0 versions of PHP.
@ -107,7 +121,7 @@ function_entry msession_functions[] = {
}; };
zend_module_entry msession_module_entry = { zend_module_entry msession_module_entry = {
#if ZEND_MODULE_API_NO >= 20010901 #ifdef PHP_4_1_API
STANDARD_MODULE_HEADER, STANDARD_MODULE_HEADER,
#endif #endif
"msession", "msession",
@ -117,7 +131,7 @@ zend_module_entry msession_module_entry = {
PHP_RINIT(msession), PHP_RINIT(msession),
PHP_RSHUTDOWN(msession), PHP_RSHUTDOWN(msession),
PHP_MINFO(msession), PHP_MINFO(msession),
#if ZEND_MODULE_API_NO >= 20010901 #ifdef PHP_4_1_API
NO_VERSION_YET, NO_VERSION_YET,
#endif #endif
STANDARD_MODULE_PROPERTIES STANDARD_MODULE_PROPERTIES
@ -174,9 +188,7 @@ PHP_MINFO_FUNCTION(msession)
int PHPMsessionConnect(const char *szhost, int nport) int PHPMsessionConnect(const char *szhost, int nport)
{ {
#if ZEND_MODULE_API_NO >= 20010901
TSRMLS_FETCH(); TSRMLS_FETCH();
#endif
if(!s_reqb) if(!s_reqb)
s_reqb = AllocateRequestBuffer(2048); s_reqb = AllocateRequestBuffer(2048);
@ -187,11 +199,7 @@ int PHPMsessionConnect(const char *szhost, int nport)
if(s_conn) if(s_conn)
{ {
CloseReqConn(s_conn); CloseReqConn(s_conn);
#ifdef ZEND_MODULE_API_NO >= 20010901
php_log_err("Call to connect with non-null s_conn" TSRMLS_CC); php_log_err("Call to connect with non-null s_conn" TSRMLS_CC);
#else
php_log_err("Call to connect with non-null s_conn");
#endif
} }
if(strcmp(s_szhost, szhost)) if(strcmp(s_szhost, szhost))
{ {
@ -739,9 +747,10 @@ PHP_FUNCTION(msession_set_array)
HashPosition pos; HashPosition pos;
zval **entry; zval **entry;
char *key; char *key;
#if ZEND_MODULE_API_NO >= 20010901 #ifdef PHP_4_1_API
uint keylen; uint keylen;
#else #endif
#ifdef PHP_4_0_API
ulong keylen; ulong keylen;
#endif #endif
ulong numndx; ulong numndx;