diff options
| author | Xinchen Hui <laruence@gmail.com> | 2018-06-11 21:01:10 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2018-06-11 21:01:10 +0800 |
| commit | 1a952bca2261218af891f944c2d31e43df8ab19d (patch) | |
| tree | 16e3218d5a645374bdc71f850d44a2b96a50131b | |
| parent | ffaee27478a9cb338e40edeb5acf233f9cb67111 (diff) | |
| parent | b2a200188f06714aff07a5f928802de8b5f67c86 (diff) | |
| download | php-git-1a952bca2261218af891f944c2d31e43df8ab19d.tar.gz | |
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Remove inappropriate FreeLibrary calls
Remove inappropriate FreeLibrary call
The ZEND_EXTENSION change is merged with xdebug now so we can drop this for master only
Fixed bug #76443 (php+php_interbase.dll crash on module_shutdown)
| -rw-r--r-- | ext/interbase/interbase.c | 3 | ||||
| -rw-r--r-- | ext/pdo_firebird/firebird_driver.c | 3 | ||||
| -rw-r--r-- | win32/build/confutils.js | 5 | ||||
| -rw-r--r-- | win32/ioutil.c | 2 | ||||
| -rw-r--r-- | win32/time.c | 3 |
5 files changed, 0 insertions, 16 deletions
diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c index 376ecc4da8..27cbb320b6 100644 --- a/ext/interbase/interbase.c +++ b/ext/interbase/interbase.c @@ -833,9 +833,6 @@ PHP_MINFO_FUNCTION(ibase) info_func(s = tmp); } php_info_print_table_row(2, "Run-time Client Library Version", s); -#ifdef PHP_WIN32 - FreeLibrary(l); -#endif } while (0); #endif php_info_print_table_end(); diff --git a/ext/pdo_firebird/firebird_driver.c b/ext/pdo_firebird/firebird_driver.c index 6138c5aee7..6b77e31372 100644 --- a/ext/pdo_firebird/firebird_driver.c +++ b/ext/pdo_firebird/firebird_driver.c @@ -545,9 +545,6 @@ static int firebird_handle_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *v info_func(tmp); ZVAL_STRING(val, tmp); } -#ifdef PHP_WIN32 - FreeLibrary(l); -#endif #else ZVAL_NULL(val); #endif diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 0dd34c9a24..ce512b549f 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -2023,11 +2023,6 @@ function generate_tmp_php_ini() var directive = (extensions_enabled[i][2] ? 'zend_extension' : 'extension'); - // FIXME: Remove this once ZEND_EXTENSION() is merged to XDEBUG - if ("xdebug" == extensions_enabled[i][0]) { - directive = "zend_extension"; - } - var ext_name = extensions_enabled[i][0]; if ("gd" == ext_name) { ext_name = "gd2"; diff --git a/win32/ioutil.c b/win32/ioutil.c index 5f119a9410..9e54e96342 100644 --- a/win32/ioutil.c +++ b/win32/ioutil.c @@ -625,8 +625,6 @@ BOOL php_win32_ioutil_init(void) if (!canonicalize_path_w) { canonicalize_path_w = (MyPathCchCanonicalizeEx)MyPathCchCanonicalizeExFallback; } - - FreeLibrary(hMod); } else { canonicalize_path_w = (MyPathCchCanonicalizeEx)MyPathCchCanonicalizeExFallback; } diff --git a/win32/time.c b/win32/time.c index 58f4230c50..f5c8ff5683 100644 --- a/win32/time.c +++ b/win32/time.c @@ -38,9 +38,6 @@ static zend_always_inline MyGetSystemTimeAsFileTime get_time_func(void) if (hMod) { /* Max possible resolution <1us, win8/server2012 */ timefunc = (MyGetSystemTimeAsFileTime)GetProcAddress(hMod, "GetSystemTimePreciseAsFileTime"); - - /* Lower the refcount */ - FreeLibrary(hMod); } if(!timefunc) { |