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

diff --git a/apache-httpd.conf b/apache-httpd.conf
index 6c7b35cfdf38630efc43766de1aff9d944cf1dec..177a860967681c26cae1f647b02d607a08015de5 100644 (file)
--- 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 cee3f8a52f46667e0ce2cef79ebdb6997a047d7d..679203500d45df15ac23fa2637568478cb369bc1 100644 (file)
--- 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 662ff20f8e6bb715f57247a1fe77b174696a467d..e23c0a10b8fcb2e89a47faee13ca0e98e74291bf 100644 (file)
--- 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 b3f5b7f83a3271a0910a3b87c3253a2a015c5975..25e25e9d5ab1ed7f9c5aee55fbc0cc3e3cd8cf8c 100644 (file)
--- 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 f1704fef3fb91337833533b9b0d38a6a569ae3f0..a7ebe7216d000d34e008002a1a683f36a5433874 100644 (file)
--- 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 bfaa67c67f33b1b32805fce0e623fcda9305ab5b..942867970d158d845bef8299d4d14bfbe51e00eb 100644 (file)
--- 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 fe8147433f60ea9e522c4bb4f144f1a7767b4bab..cea791f0d1fd58408158c030f2c16f2e8340a95e 100644 (file)
--- 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 9e3cbf2baaa7a35c3d2fae80808704f9e51c09c9..427a247b5b01cf617050fc31b996719f7b8c105c 100644 (file)
--- 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 7c4c4865768b1ebe5aed595c3f2f10057917739f..298a5d4eb4497a2a677f89f99685c10ba6481b94 100644 (file)
--- 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 4b11a7256476a5d9a10119e15aaf7cd9a5704cfb..f4f22e8e7a9ec637a38806ede2a854377fe885a0 100644 (file)
--- 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 cf7fbed8a5477fc98ccc62eaa9cd86caac8416c1..0633dbbe3eef1b4ed008e5d1e353d108d155e7a7 100644 (file)
--- 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 1770ee6fce02c32cd83022013a1437a21b3b4576..757379af835d81c2dffbb16d397713876f1789aa 100644 (file)
--- 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 3bb30b21aa06c20704813e3661d166a52edbeb9f..6645b96d8e906bde1264408b3d1f1a4d161e9f1c 100644 (file)
--- 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 f579d27c0e406b93e10018849c14b5b6b41d0751..ac53179a79f1b01592847313d92e7a6f70edee83 100644 (file)
--- 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 56b70e9e77f5d83ee85a315faed20d039b8c3640..bfc2c8486668e32c547f62170d799e1e6398218c 100644 (file)
--- 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 30520ad6071d5548d746217719f34b8d034548ae..1bcff5d78509fd0ae568e89cfb9a28c215078711 100644 (file)
--- 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 ba3d7f8cd19f1a3315ee9c72c3819ba0c02682bc..b33826ee9aad981792e0afc78c12f037587d8d59 100644 (file)
--- 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>

diff --git a/apache.spec b/apache.spec
index 3e72ce9485339b1118840f0698fceda83bee08d6..30b37547948ab0bdf9e2b15f95204d248a54605b 100644 (file)
--- 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