From 65a7e5f2b93ec6515df5cc48baad900394bc75d9 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
Date: Thu, 29 Aug 2013 10:22:49 +0300
Subject: [PATCH] merge fpm-status path changes from 5.3

---
 php-fpm-config.patch | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/php-fpm-config.patch b/php-fpm-config.patch
index 03a9a7b..353c012 100644
--- a/php-fpm-config.patch
+++ b/php-fpm-config.patch
@@ -53,3 +53,25 @@
  ;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
-- 
2.44.0