- conflict with older memcache ext which did not load after session ext; rel 2

[packages/php.git] / php-fpm.patch

diff --git a/php-fpm.patch b/php-fpm.patch
index 16d314cd88c77baa6d0c2892dde2a3347c982f58..eee281cffd0c9c1fdf7359d180c878cc1b2a3cbf 100644 (file)
--- a/php-fpm.patch
+++ b/php-fpm.patch
@@ -522,7 +522,7 @@ diff -Nru php-5.2.8.vanilla/libevent/strlcpy-internal.h php-5.2.8.fpm/libevent/s
  #endif
        }
        return is_fastcgi;
-@@ -249,12 +256,27 @@
+@@ -249,6 +256,16 @@
        }
  }
  
@@ -539,17 +539,6 @@ diff -Nru php-5.2.8.vanilla/libevent/strlcpy-internal.h php-5.2.8.fpm/libevent/s
  void fcgi_shutdown(void)
  {
        if (is_initialized) {
-               zend_hash_destroy(&fcgi_mgmt_vars);
-       }
-       is_fastcgi = 0;
-+
-+      if (allowed_clients) {
-+              free(allowed_clients);
-+              allowed_clients = 0;
-+      }
- }
- 
- #ifdef _WIN32
 @@ -327,6 +349,41 @@
  }
  #endif