---- 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 @@
+--- php-5.4.7/sapi/fpm/php-fpm.conf.in 2012-10-05 22:16:44.895998479 +0300
++++ php-5.3.17/sapi/fpm/php-fpm.conf.in 2012-10-12 12:35:47.601602945 +0300
+@@ -12,7 +12,7 @@
+ ; Relative path can also be used. They will be prefixed by:
+ ; - the global prefix if it's been set (-p arguement)
+ ; - @prefix@ otherwise
+-;include=etc/fpm.d/*.conf
++;include=/etc/php/fpm.d/*.conf
+
+ ;;;;;;;;;;;;;;;;;;
+ ; Global Options ;
+@@ -22,14 +22,14 @@
; Pid file
; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
; Default Value: none
-;pid = run/php-fpm.pid
-+pid = /var/run/php/@processname@.pid
++pid = /var/run/@processname@.pid
; Error log file
+ ; If it's set to "syslog", log is sent to syslogd instead of being written
+ ; in a local file.
; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
+ ; Default Value: log/php-fpm.log
+-;error_log = log/php-fpm.log
++error_log = /var/log/php/@processname@.log
+
+ ; syslog_facility is used to specify what type of program is logging the
+ ; message. This lets syslogd specify that messages from different facilities
@@ -93,7 +93,7 @@
; specific port;
; '/path/to/unix/socket' - to listen on a unix socket.
;env[TMP] = /tmp
;env[TMPDIR] = /tmp
;env[TEMP] = /tmp
+--- php-5.3.9/sapi/fpm/status.html.in~ 2011-10-08 23:43:12.000000000 +0300
++++ php-5.3.9/sapi/fpm/status.html.in 2012-01-12 02:19:09.573191879 +0200
+@@ -96,7 +96,7 @@
+ var sort_index;
+ var sort_order;
+
+- doc_url.value = location.protocol + '//' + location.host + "/status?json&full";
++ doc_url.value = location.protocol + '//' + location.host + "/fpm-status?json&full";
+
+ ths = document.getElementsByTagName("th");
+ for (var i=0; i<ths.length; i++) {
+--- php-5.4.18/sapi/fpm/Makefile.frag~ 2013-08-14 08:47:24.000000000 +0300
++++ php-5.4.18/sapi/fpm/Makefile.frag 2013-08-29 10:20:38.161424172 +0300
+@@ -12,7 +12,7 @@
+
+ @echo "Installing PHP FPM config: $(INSTALL_ROOT)$(sysconfdir)/" && \
+ $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir) || :
+- @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || :
++ @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf || :
+
+ @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/"
+ @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8