diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2013-12-12 20:30:45 +0100 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2013-12-12 20:30:45 +0100 |
| commit | 0fc8e6af0a0ff8eeb15746978ce1e6009ed76f11 (patch) | |
| tree | bd08220ec12315805e9d963667c8b91736099dd3 /sapi/thttpd | |
| parent | 4411641b1eba09fa8afe5b38af9be2ba49a51db4 (diff) | |
| download | php-git-0fc8e6af0a0ff8eeb15746978ce1e6009ed76f11.tar.gz | |
Eliminate another straight forward TSRMLS_FETCH() in zend_startup_module()
# For THTTPD:
# The code that uses a call to this function is for older versions of PHP anyway so its not covered
# For Zend OpCache:
# Added a new define for 5.6 and wrapped the code around that so its still compatible with older version
Diffstat (limited to 'sapi/thttpd')
| -rw-r--r-- | sapi/thttpd/thttpd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sapi/thttpd/thttpd.c b/sapi/thttpd/thttpd.c index 548bcda170..b136b71d7b 100644 --- a/sapi/thttpd/thttpd.c +++ b/sapi/thttpd/thttpd.c @@ -349,11 +349,12 @@ static zend_module_entry php_thttpd_module = { STANDARD_MODULE_PROPERTIES }; -static int php_thttpd_startup(sapi_module_struct *sapi_module) +static int php_thttpd_startup(sapi_module_struct *sapi_module TSRMLS_DC) { #if PHP_API_VERSION >= 20020918 if (php_module_startup(sapi_module, &php_thttpd_module, 1) == FAILURE) { #else + /* No TSRMLS_CC here to zend_startup_module() as 5.6 and older does not have that parameter */ if (php_module_startup(sapi_module) == FAILURE || zend_startup_module(&php_thttpd_module) == FAILURE) { #endif |