[php-pecl-xhprof] make configuration file compatible with apache 2.2 / 2.4
Remi Collet
remi at fedoraproject.org
Mon May 7 05:58:07 UTC 2012
commit 953a90cc4a680a8022177f590cd6bbabba8c1ff6
Author: remi <fedora at famillecollet.com>
Date: Mon May 7 07:57:32 2012 +0200
make configuration file compatible with apache 2.2 / 2.4
php-pecl-xhprof.spec | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
---
diff --git a/php-pecl-xhprof.spec b/php-pecl-xhprof.spec
index 605fc8e..f104146 100644
--- a/php-pecl-xhprof.spec
+++ b/php-pecl-xhprof.spec
@@ -1,10 +1,10 @@
%{!?__pecl: %{expand: %%global __pecl %{_bindir}/pecl}}
-%define pecl_name xhprof
+%global pecl_name xhprof
Name: php-pecl-xhprof
Version: 0.9.2
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: PHP extension for XHProf, a Hierarchical Profiler
Group: Development/Languages
License: ASL 2.0
@@ -88,11 +88,22 @@ EOF
# Apache configuration file
cat >httpd.conf <<EOF
Alias /xhprof /usr/share/xhprof/xhprof_html
+
<Directory /usr/share/xhprof/xhprof_html>
- order deny,allow
- deny from all
- allow from 127.0.0.1
- allow from ::1
+ <IfModule mod_authz_core.c>
+ # Apache 2.4
+ <RequireAny>
+ Require ip 127.0.0.1
+ Require ip ::1
+ </RequireAny>
+ </IfModule>
+ <IfModule !mod_authz_core.c>
+ # Apache 2.2
+ Order Deny,Allow
+ Deny from All
+ Allow from 127.0.0.1
+ Allow from ::1
+ </IfModule>
</Directory>
EOF
@@ -196,6 +207,9 @@ fi
%changelog
+* Sun May 06 2012 Remi Collet <remi at fedoraproject.org> - 0.9.2-5
+- make configuration file compatible with apache 2.2 / 2.4
+
* Mon Mar 05 2012 Remi Collet <remi at fedoraproject.org> - 0.9.2-4
- rename patches
- install html and lib under /usr/share/xhprof
More information about the scm-commits
mailing list