RE: [PHP-CVS] com php-src: Fixed bug #5453 (WSA cleanup executes before MSHUTDOWN): NEWS main/main.c

Kalle, ping. Regards Anatol > -----Original Message----- > From: Anatol Belski [mailto:anatol.php@belski.net] > Sent: Friday, October 28, 2016 8:20 PM > To: 'Kalle Sommer Nielsen' <kalle@php.net>; php-cvs@lists.php.net > Subject: RE: [PHP-CVS] com php-src: Fixed bug #5453 (WSA cleanup executes > before MSHUTDOWN): NEWS main/main.c > > Hi Kalle, > > > Commit: 7813e9de11500b51b9e30193fcdb7d09cf99a7cf > > Author: Kalle Sommer Nielsen <kalle@php.net> Sat, 6 Aug 2016 04:06:50 > > --- a/main/main.c > > +++ b/main/main.c > > @@ -2137,6 +2137,11 @@ int php_module_startup(sapi_module_struct *sf, > > zend_module_entry *additional_mod > > php_printf("\nwinsock.dll unusable. %d\n", WSAGetLastError()); > > return FAILURE; > > } > > + /* Check that we actually got the requested WSA version */ > > + if (LOBYTE(wsaData.wVersion) != 2 || HIBYTE(wsaData.wVersion) != 0) { > > + php_printf("\nwinsock.dll unusable. Requested version: %d.%d, > > got %d.%d", LOBYTE(wVersionRequested), HIBYTE(wVersionRequested), > > LOBYTE(wsaData.wVersion), HIBYTE(wsaData.wVersion)); > > + return FAILURE; > > + } > > #endif > > > Besides the condition is not quite correct, the check in general is senseless. All > the supported versions link with WS2.. > > Regards > > Anatol > > > le_index_ptr = zend_register_list_destructors_ex(NULL, NULL, "index > > pointer", 0); @@ -2387,11 +2392,6 @@ void php_module_shutdown(void) > > ts_free_worker_threads(); > > #endif > > > > -#if defined(PHP_WIN32) || (defined(NETWARE) && defined(USE_WINSOCK)) > > - /*close winsock */ > > - WSACleanup(); > > -#endif > > - > > #ifdef PHP_WIN32 > > php_win32_free_rng_lock(); > > #endif > > @@ -2400,6 +2400,11 @@ void php_module_shutdown(void) > > > > zend_shutdown(); > > > > +#if defined(PHP_WIN32) || (defined(NETWARE) && defined(USE_WINSOCK)) > > + /*close winsock */ > > + WSACleanup(); > > +#endif > > + > > /* Destroys filter & transport registries too */ > > php_shutdown_stream_wrappers(module_number); > > > > > > -- > > PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: > > http://www.php.net/unsub.php > > > > -- > PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: > http://www.php.net/unsub.php