1 --- php-5.4.7/sapi/fpm/php-fpm.conf.in 2012-10-05 22:16:44.895998479 +0300
2 +++ php-5.3.17/sapi/fpm/php-fpm.conf.in 2012-10-12 12:35:47.601602945 +0300
4 ; Relative path can also be used. They will be prefixed by:
5 ; - the global prefix if it's been set (-p arguement)
7 -;include=etc/fpm.d/*.conf
8 +;include=/etc/php/fpm.d/*.conf
14 ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
16 -;pid = run/php-fpm.pid
17 +pid = /var/run/@processname@.pid
20 ; If it's set to "syslog", log is sent to syslogd instead of being written
22 ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
23 ; Default Value: log/php-fpm.log
24 -;error_log = log/php-fpm.log
25 +error_log = /var/log/php/@processname@.log
27 ; syslog_facility is used to specify what type of program is logging the
28 ; message. This lets syslogd specify that messages from different facilities
31 ; '/path/to/unix/socket' - to listen on a unix socket.
32 ; Note: This value is mandatory.
33 -listen = 127.0.0.1:9000
34 +listen = /var/run/php/@processname@.sock
36 ; Set listen(2) backlog. A value of '-1' means unlimited.
37 ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
39 ; must be separated by a comma. If this value is left blank, connections will be
40 ; accepted from any ip address.
42 -;listen.allowed_clients = 127.0.0.1
43 +listen.allowed_clients = 127.0.0.1
45 ; Set permissions for unix socket, if one is used. In Linux, read/write
46 ; permissions must be set in order to allow connections from a web server. Many
48 ; the current environment.
49 ; Default Value: clean env
50 ;env[HOSTNAME] = $HOSTNAME
51 -;env[PATH] = /usr/local/bin:/usr/bin:/bin
56 --- php-5.3.9/sapi/fpm/status.html.in~ 2011-10-08 23:43:12.000000000 +0300
57 +++ php-5.3.9/sapi/fpm/status.html.in 2012-01-12 02:19:09.573191879 +0200
62 - doc_url.value = location.protocol + '//' + location.host + "/status?json&full";
63 + doc_url.value = location.protocol + '//' + location.host + "/fpm-status?json&full";
65 ths = document.getElementsByTagName("th");
66 for (var i=0; i<ths.length; i++) {
67 --- php-5.4.18/sapi/fpm/Makefile.frag~ 2013-08-14 08:47:24.000000000 +0300
68 +++ php-5.4.18/sapi/fpm/Makefile.frag 2013-08-29 10:20:38.161424172 +0300
71 @echo "Installing PHP FPM config: $(INSTALL_ROOT)$(sysconfdir)/" && \
72 $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir) || :
73 - @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || :
74 + @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf || :
76 @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/"
77 @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8