]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2' into PHP-7.3
authorGeorge Wang <gwang@php.net>
Thu, 21 Nov 2019 22:58:16 +0000 (17:58 -0500)
committerGeorge Wang <gwang@php.net>
Thu, 21 Nov 2019 22:58:16 +0000 (17:58 -0500)
1  2 
sapi/litespeed/lsapi_main.c

index d3ac79eb7b2153eb8fe9ed0e7c549c762990c3c6,5e31a50af9a2fb22632cb2bd93eb21daf22b0fc7..c7548b5e83d4bed97d328b1890c2379d64cfed7f
@@@ -1583,9 -1602,11 +1587,10 @@@ int main( int argc, char * argv[] 
          php_bind = NULL;
      }
  
 -    int iRequestsProcessed = 0;
      int result;
  
-     atexit(lsapi_atexit);
+     if (do_clean_shutdown)
+         atexit(lsapi_atexit);
  
      while( ( result = LSAPI_Prefork_Accept_r( &g_req )) >= 0 ) {
  #if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__)