Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D7C26D943 for ; Sun, 14 Oct 2012 15:35:04 +0000 (UTC) Received: (qmail 73802 invoked by uid 500); 14 Oct 2012 15:35:04 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 73725 invoked by uid 500); 14 Oct 2012 15:35:04 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 73715 invoked by uid 99); 14 Oct 2012 15:35:03 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Oct 2012 15:35:03 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Oct 2012 15:35:02 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B595723889B8; Sun, 14 Oct 2012 15:34:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1398097 - /httpd/httpd/branches/2.2.x/STATUS Date: Sun, 14 Oct 2012 15:34:19 -0000 To: cvs@httpd.apache.org From: gryzor@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121014153419.B595723889B8@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gryzor Date: Sun Oct 14 15:34:19 2012 New Revision: 1398097 URL: http://svn.apache.org/viewvc?rev=1398097&view=rev Log: Suggest backporting FallbackResource 'disabled' patch into 2.2 Modified: httpd/httpd/branches/2.2.x/STATUS Modified: httpd/httpd/branches/2.2.x/STATUS URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1398097&r1=1398096&r2=1398097&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/STATUS (original) +++ httpd/httpd/branches/2.2.x/STATUS Sun Oct 14 15:34:19 2012 @@ -124,7 +124,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: ssl_engine_kernel.c: In function 'ssl_callback_AdvertiseNextProtos': ssl_engine_kernel.c:2140:5: warning: implicit declaration of function 'modssl_run_npn_advertise_protos_hook' - Including mod_ssl.h after ssl_private.h seems to suffice. + Including mod_ssl.h after ssl_private.h seems to suffice. The change introduces hard linkages from modules into mod_ssl.so (distinct from httpd), AP is the incorrect namespace, see mod_dav main hooks as an example. @@ -204,7 +204,12 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1395225 2.2.x patch: https://people.apache.org/~kbrand/ab-tlsv1_x-2.2.x.patch +1: kbrand - + + * mod_dir: Support for the 'disabled' FallbackResource argument + trunk patch : https://svn.apache.org/viewvc?view=revision&revision=1398066 + Also suggested for backport to 2.4 + 2.2.x patch: trunk patch works + PATCHES/ISSUES THAT ARE STALLED