Changeset 1602 for trunk/server/fedora

Timestamp:

Aug 26, 2010, 3:14:03 PM (14 years ago)

Author:

gdb

Message:

httpd: Add method to merge virtual host with a main server_rec

File:

• trunk/server/fedora/specs/httpd.spec.patch (modified) (4 diffs)

trunk/server/fedora/specs/httpd.spec.patch

@@ -10 +10 @@
  Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
  Source1: index.html
-@@ -55,6 +55,13 @@
+@@ -55,6 +55,14 @@
  Conflicts: pcre < 4.0
  Requires: httpd-tools = %{version}-%{release}, apr-util-ldap
@@ -20 +20 @@
 +Patch1005: httpd-2.2.x-mod_ssl-sessioncaching.patch
 +Patch1006: httpd-suexec-cloexec.patch
++Patch1007: httpd-fixup-vhost.patch
 +
  %description
@@ -32 +33 @@
  
  %description -n mod_ssl
-@@ -129,6 +137,12 @@
+@@ -129,6 +137,13 @@
  # Patch in vendor/release string
  sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -41 +42 @@
 +%patch1005 -p1 -b .ssl-sessioncache
 +%patch1006 -p1 -b .cloexec
++%patch1007 -p1 -b .fixup-vhost
 +
  # Safety check: prevent build if defined MMN does not equal upstream MMN.