[packages/apache] - rel 1; works here; upgrade from all-apache packages 2.2 to 2.4 worked; partial upgrade need more t

arekm arekm at pld-linux.org
Wed Dec 5 23:28:52 CET 2012 

commit c7fbb6d99514220bf5fd7f22b53172b6839064c1
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed Dec 5 23:28:48 2012 +0100

    - rel 1; works here; upgrade from all-apache packages 2.2 to 2.4 worked; partial upgrade need more testing

 apache-httpd.conf           | 5 ++---
 apache-mod_authz_host.conf  | 1 -
 apache-mod_autoindex.conf   | 1 -
 apache-mod_cgid.conf        | 1 -
 apache-mod_dav.conf         | 1 -
 apache-mod_deflate.conf     | 1 -
 apache-mod_dir.conf         | 1 -
 apache-mod_info.conf        | 1 -
 apache-mod_log_config.conf  | 1 -
 apache-mod_mime.conf        | 1 -
 apache-mod_mime_magic.conf  | 1 -
 apache-mod_proxy.conf       | 6 +++++-
 apache-mod_ssl.conf         | 1 -
 apache-mod_status.conf      | 1 -
 apache-mod_suexec.conf      | 1 -
 apache-mod_userdir.conf     | 1 -
 apache-mod_vhost_alias.conf | 1 -
 apache.spec                 | 2 +-
 18 files changed, 8 insertions(+), 20 deletions(-)
---
diff --git a/apache.spec b/apache.spec
index 3e72ce9..30b3754 100644
--- a/apache.spec
+++ b/apache.spec
@@ -35,7 +35,7 @@ Summary(ru.UTF-8):	Самый популярный веб-сервер
 Summary(tr.UTF-8):	Lider WWW tarayıcı
 Name:		apache
 Version:	2.4.3
-Release:	0.1
+Release:	1
 License:	Apache v2.0
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
diff --git a/apache-httpd.conf b/apache-httpd.conf
index 6c7b35c..177a860 100644
--- a/apache-httpd.conf
+++ b/apache-httpd.conf
@@ -1,5 +1,3 @@
-# $Id$
-#
 # This is the main Apache HTTP server configuration file.
 # It contains the configuration directives that give the server its instructions.
 #
@@ -9,12 +7,13 @@
 # <URL:http://httpd.apache.org/docs/2.2/mod/directives.html>
 # for a discussion of each configuration directive.
 
+LoadModule unixd_module   modules/mod_unixd.so
+
 ServerRoot "/etc/httpd"
 
 # User/Group: The name (or #number) of the user/group to run httpd as.
 # It is usually good practice to create a dedicated user and group for
 # running httpd, as with most system services.
-LoadModule unixd_module   modules/mod_unixd.so
 User http
 Group http
 
diff --git a/apache-mod_authz_host.conf b/apache-mod_authz_host.conf
index cee3f8a..6792035 100644
--- a/apache-mod_authz_host.conf
+++ b/apache-mod_authz_host.conf
@@ -1,4 +1,3 @@
-# $Id$
 LoadModule authz_host_module modules/mod_authz_host.so
 
 # The following lines prevent .htaccess and .htpasswd files from being
diff --git a/apache-mod_autoindex.conf b/apache-mod_autoindex.conf
index 662ff20..e23c0a1 100644
--- a/apache-mod_autoindex.conf
+++ b/apache-mod_autoindex.conf
@@ -1,4 +1,3 @@
-# $Id$
 LoadModule autoindex_module	modules/mod_autoindex.so
 
 #
diff --git a/apache-mod_cgid.conf b/apache-mod_cgid.conf
index b3f5b7f..25e25e9 100644
--- a/apache-mod_cgid.conf
+++ b/apache-mod_cgid.conf
@@ -1,4 +1,3 @@
-# $Id$
 LoadModule cgid_module	modules/mod_cgid.so
 
 <IfModule cgid_module>
diff --git a/apache-mod_dav.conf b/apache-mod_dav.conf
index f1704fe..a7ebe72 100644
--- a/apache-mod_dav.conf
+++ b/apache-mod_dav.conf
@@ -1,4 +1,3 @@
-# $Id$
 LoadModule dav_module		modules/mod_dav.so
 LoadModule dav_fs_module	modules/mod_dav_fs.so
 LoadModule dav_lock_module	modules/mod_dav_lock.so
diff --git a/apache-mod_deflate.conf b/apache-mod_deflate.conf
index bfaa67c..9428679 100644
--- a/apache-mod_deflate.conf
+++ b/apache-mod_deflate.conf
@@ -1,4 +1,3 @@
-# $Id$
 LoadModule deflate_module		modules/mod_deflate.so
 
 # Safe but working settings - compress only that types:
diff --git a/apache-mod_dir.conf b/apache-mod_dir.conf
index fe81474..cea791f 100644
--- a/apache-mod_dir.conf
+++ b/apache-mod_dir.conf
@@ -1,4 +1,3 @@
-# $Id$
 LoadModule dir_module	modules/mod_dir.so
 
 # DirectoryIndex: sets the file that Apache will serve if a directory
diff --git a/apache-mod_info.conf b/apache-mod_info.conf
index 9e3cbf2..427a247 100644
--- a/apache-mod_info.conf
+++ b/apache-mod_info.conf
@@ -1,4 +1,3 @@
-# $Id$
 LoadModule info_module		modules/mod_info.so
 
 # Get information about the requests being processed by the server
diff --git a/apache-mod_log_config.conf b/apache-mod_log_config.conf
index 7c4c486..298a5d4 100644
--- a/apache-mod_log_config.conf
+++ b/apache-mod_log_config.conf
@@ -1,4 +1,3 @@
-# $Id$
 LoadModule log_config_module modules/mod_log_config.so
 
 <IfModule log_config_module>
diff --git a/apache-mod_mime.conf b/apache-mod_mime.conf
index 4b11a72..f4f22e8 100644
--- a/apache-mod_mime.conf
+++ b/apache-mod_mime.conf
@@ -1,4 +1,3 @@
-# $Id$
 LoadModule mime_module modules/mod_mime.so
 
 <IfModule mime_module>
diff --git a/apache-mod_mime_magic.conf b/apache-mod_mime_magic.conf
index cf7fbed..0633dbb 100644
--- a/apache-mod_mime_magic.conf
+++ b/apache-mod_mime_magic.conf
@@ -1,4 +1,3 @@
-# $Id$
 LoadModule mime_magic_module modules/mod_mime_magic.so
 
 # The mod_mime_magic module allows the server to use various hints from the
diff --git a/apache-mod_proxy.conf b/apache-mod_proxy.conf
index 1770ee6..757379a 100644
--- a/apache-mod_proxy.conf
+++ b/apache-mod_proxy.conf
@@ -1,4 +1,3 @@
-# $Id$
 LoadModule proxy_module			 modules/mod_proxy.so
 
 # FIXME: enable or disable these by default?
@@ -33,6 +32,11 @@ ProxyRequests On
 #	Require host .your-domain.com
 </Proxy>
 
+# enable local fcgi proxy request, e.x for php-fpm
+#<Proxy fcgi://127.0.0.1:*>
+#	Require all granted
+#</Proxy>
+
 #
 # Enable/disable the handling of HTTP/1.1 "Via:" headers.
 # ("Full" adds the server version; "Block" removes all outgoing Via: headers)
diff --git a/apache-mod_ssl.conf b/apache-mod_ssl.conf
index 3bb30b2..6645b96 100644
--- a/apache-mod_ssl.conf
+++ b/apache-mod_ssl.conf
@@ -1,4 +1,3 @@
-# $Id$
 LoadModule ssl_module	modules/mod_ssl.so
 
 # This is the Apache server configuration file providing SSL support.
diff --git a/apache-mod_status.conf b/apache-mod_status.conf
index f579d27..ac53179 100644
--- a/apache-mod_status.conf
+++ b/apache-mod_status.conf
@@ -1,4 +1,3 @@
-# $Id$
 LoadModule status_module		modules/mod_status.so
 
 #
diff --git a/apache-mod_suexec.conf b/apache-mod_suexec.conf
index 56b70e9..bfc2c84 100644
--- a/apache-mod_suexec.conf
+++ b/apache-mod_suexec.conf
@@ -1,2 +1 @@
-# $Id$
 LoadModule suexec_module		modules/mod_suexec.so
diff --git a/apache-mod_userdir.conf b/apache-mod_userdir.conf
index 30520ad..1bcff5d 100644
--- a/apache-mod_userdir.conf
+++ b/apache-mod_userdir.conf
@@ -1,4 +1,3 @@
-# $Id$
 LoadModule userdir_module	   modules/mod_userdir.so
 
 # Settings for user home directories
diff --git a/apache-mod_vhost_alias.conf b/apache-mod_vhost_alias.conf
index ba3d7f8..b33826e 100644
--- a/apache-mod_vhost_alias.conf
+++ b/apache-mod_vhost_alias.conf
@@ -1,4 +1,3 @@
-# $Id$
 LoadModule vhost_alias_module   modules/mod_vhost_alias.so
 
 <IfModule mod_vhost_alias.c>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/apache.git/commitdiff/c7fbb6d99514220bf5fd7f22b53172b6839064c1

More information about the pld-cvs-commit mailing list