Changeset 1602


Ignore:
Timestamp:
Aug 26, 2010, 3:14:03 PM (11 years ago)
Author:
gdb
Message:
httpd: Add method to merge virtual host with a main server_rec
Location:
trunk/server
Files:
1 added
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/server/fedora/specs/httpd.spec.patch

    r1539 r1602  
    1010 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
    1111 Source1: index.html
    12 @@ -55,6 +55,13 @@
     12@@ -55,6 +55,14 @@
    1313 Conflicts: pcre < 4.0
    1414 Requires: httpd-tools = %{version}-%{release}, apr-util-ldap
     
    2020+Patch1005: httpd-2.2.x-mod_ssl-sessioncaching.patch
    2121+Patch1006: httpd-suexec-cloexec.patch
     22+Patch1007: httpd-fixup-vhost.patch
    2223+
    2324 %description
     
    3233 
    3334 %description -n mod_ssl
    34 @@ -129,6 +137,12 @@
     35@@ -129,6 +137,13 @@
    3536 # Patch in vendor/release string
    3637 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
     
    4142+%patch1005 -p1 -b .ssl-sessioncache
    4243+%patch1006 -p1 -b .cloexec
     44+%patch1007 -p1 -b .fixup-vhost
    4345+
    4446 # Safety check: prevent build if defined MMN does not equal upstream MMN.
Note: See TracChangeset for help on using the changeset viewer.