- php-fpm: restore listening by default on unix socket

Changed files:
    php-fpm-config.patch -> 1.11
    php.spec -> 1.937

diff --git a/php-fpm-config.patch b/php-fpm-config.patch
index 3e3cab726f486b454d451195a43d150c6ac25848..8dd9d97e5d469bf5cc2820c2913fd1f181e13d0f 100644 (file)
--- a/php-fpm-config.patch
+++ b/php-fpm-config.patch
@@ -1,5 +1,5 @@
---- php-5.3.3/sapi/fpm/php-fpm.conf.in 2010-07-24 22:29:56.752470466 +0300
-+++ php-5.3.3/sapi/fpm/php-fpm.conf.in 2010-07-25 22:30:52.547803067 +0300
+--- php-5.3.6/sapi/fpm/php-fpm.conf.in 2011-04-22 15:16:07.304822817 +0300
++++ php-5.3.6/sapi/fpm/php-fpm.conf.in 2011-04-22 15:19:46.991588712 +0300
 @@ -22,7 +22,7 @@
  ; Pid file
  ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
@@ -9,7 +9,16 @@
  
  ; Error log file
  ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
-@@ -84,7 +84,7 @@
+@@ -93,7 +93,7 @@
+ ;                            specific port;
+ ;   '/path/to/unix/socket' - to listen on a unix socket.
+ ; Note: This value is mandatory.
+-listen = 127.0.0.1:9000
++listen = /var/run/php/fpm.sock
+ 
+ ; Set listen(2) backlog. A value of '-1' means unlimited.
+ ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
+@@ -105,7 +105,7 @@
  ; must be separated by a comma. If this value is left blank, connections will be
  ; accepted from any ip address.
  ; Default Value: any
@@ -33,7 +42,7 @@
   
  ; The number of requests each child process should execute before respawning.
  ; This can be useful to work around memory leaks in 3rd party libraries. For
-@@ -245,7 +245,7 @@
+@@ -277,7 +277,7 @@
  ; the current environment.
  ; Default Value: clean env
  ;env[HOSTNAME] = $HOSTNAME

diff --git a/php.spec b/php.spec
index 91d47384406d80dc2bfaf4416c2cb62272f94a9c..d9151af7194e98dbdf1f6d0c63752a2e82e794bb 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -103,7 +103,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %undefine      with_filter
 %endif
 
-%define                rel     7
+%define                rel     8
 Summary:       PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):     Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):     Język skryptowy PHP