diff options
| author | Ondřej Surý <ondrej@sury.org> | 2012-02-03 11:02:43 +0100 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2012-02-03 11:02:43 +0100 |
| commit | 5292df2401c781de56fd04835c18e11162152626 (patch) | |
| tree | 34d9215e87887fb4f97b051ac3fa239d6cf4ee89 /win32 | |
| parent | 96fb2ff5760132a915766f1d9ec7c63001feacd8 (diff) | |
| download | php-5292df2401c781de56fd04835c18e11162152626.tar.gz | |
Imported Upstream version 5.4.0~rc7upstream/5.4.0_rc7
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/build/libs_version.txt | 16 | ||||
| -rw-r--r-- | win32/winutil.c | 8 |
2 files changed, 20 insertions, 4 deletions
diff --git a/win32/build/libs_version.txt b/win32/build/libs_version.txt index 7f808fb52..37474fd07 100644 --- a/win32/build/libs_version.txt +++ b/win32/build/libs_version.txt @@ -1,2 +1,16 @@ -libcurl-7.21.7
+bz2-1.0.6
+cclient-2007e
+freetype-2.4.3
+icu-4.6.1
+jpeglib-6b
+libcurl-7.24.0
+libiconv-1.11
+libmcrypt-2.5.8
+libmpir-1.3.1
libpng-1.2.46
+libpq-8.3.6
+libssh2-1.3.0
+libtidy-20090325
+libxslt-1.1.23
+libxml-2.7.7
+openssl-0.9.8t
diff --git a/win32/winutil.c b/win32/winutil.c index f78f653c5..0076b606a 100644 --- a/win32/winutil.c +++ b/win32/winutil.c @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: winutil.c 321634 2012-01-01 13:15:04Z felipe $ */ +/* $Id: winutil.c 322843 2012-01-27 10:56:33Z pajoye $ */ #include "php.h" #include <wincrypt.h> @@ -62,8 +62,10 @@ void php_win32_init_rng_lock() void php_win32_free_rng_lock() { tsrm_mutex_lock(php_lock_win32_cryptoctx); - CryptReleaseContext(hCryptProv, 0); - has_crypto_ctx = 0; + if (has_crypto_ctx == 1) { + CryptReleaseContext(hCryptProv, 0); + has_crypto_ctx = 0; + } tsrm_mutex_unlock(php_lock_win32_cryptoctx); tsrm_mutex_free(php_lock_win32_cryptoctx); |