Ignore:
Timestamp:
Sep 22, 2013, 7:05:37 PM (9 years ago)
Author:
glasgall
Message:
update httpd patches for 2.4.6
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/fc19-dev/server/common/patches/httpd-fixup-vhost.patch

    r2439 r2469  
    1 From 373eb8f72153417173d8ecdf11223fba0a740c19 Mon Sep 17 00:00:00 2001
     1From e90c8e59a93e5dde747e6dec7b960d2a6f2523ab Mon Sep 17 00:00:00 2001
    22From: Alexander Chernyakhovsky <achernya@mit.edu>
    33Date: Fri, 3 May 2013 22:43:28 -0400
    4 Subject: [PATCH 4/4] Export method to fixup a single virtual host
     4Subject: [PATCH] Export method to fixup a single virtual host
    55
    66Apache normally provides ap_fixup_virtual_hosts, which merges the
     
    1212ap_fixup_virtual_hosts.
    1313---
    14  include/http_config.h |    9 ++++++++
    15  server/config.c       |   58 +++++++++++++++++++++++++++----------------------
     14 include/http_config.h |  9 ++++++++
     15 server/config.c       | 58 ++++++++++++++++++++++++++++-----------------------
    1616 2 files changed, 41 insertions(+), 26 deletions(-)
    1717
     
    3737  * Reserve some modules slots for modules loaded by other means than
    3838diff --git a/server/config.c b/server/config.c
    39 index bc0804a..22a131e 100644
     39index c1aae17..254c5d2 100644
    4040--- a/server/config.c
    4141+++ b/server/config.c
    42 @@ -2246,46 +2246,52 @@ AP_DECLARE(void) ap_merge_log_config(const struct ap_logconf *old_conf,
     42@@ -2245,46 +2245,52 @@ AP_DECLARE(void) ap_merge_log_config(const struct ap_logconf *old_conf,
    4343     }
    4444 }
     
    120120 }
    121121--
    122 1.7.9.6 (Apple Git-31.1)
     1221.8.1.2
    123123
Note: See TracChangeset for help on using the changeset viewer.