Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B397A200B9F for ; Tue, 11 Oct 2016 15:42:41 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B24D7160AE6; Tue, 11 Oct 2016 13:42:41 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 05D70160AD2 for ; Tue, 11 Oct 2016 15:42:40 +0200 (CEST) Received: (qmail 80194 invoked by uid 500); 11 Oct 2016 13:42:40 -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 80185 invoked by uid 99); 11 Oct 2016 13:42:40 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Oct 2016 13:42:40 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id C83FAC0957 for ; Tue, 11 Oct 2016 13:42:39 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -1.199 X-Spam-Level: X-Spam-Status: No, score=-1.199 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id luAY1dXKMio0 for ; Tue, 11 Oct 2016 13:42:35 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id E2F195FAF7 for ; Tue, 11 Oct 2016 13:42:34 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 20E49E00A5 for ; Tue, 11 Oct 2016 13:42:34 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 1FEA33A168D for ; Tue, 11 Oct 2016 13:42:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1764243 - in /httpd/httpd/trunk: CHANGES modules/http2/h2_version.h Date: Tue, 11 Oct 2016 13:42:34 -0000 To: cvs@httpd.apache.org From: icing@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20161011134234.1FEA33A168D@svn01-us-west.apache.org> archived-at: Tue, 11 Oct 2016 13:42:41 -0000 Author: icing Date: Tue Oct 11 13:42:33 2016 New Revision: 1764243 URL: http://svn.apache.org/viewvc?rev=1764243&view=rev Log: update after backport Modified: httpd/httpd/trunk/CHANGES httpd/httpd/trunk/modules/http2/h2_version.h Modified: httpd/httpd/trunk/CHANGES URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1764243&r1=1764242&r2=1764243&view=diff ============================================================================== --- httpd/httpd/trunk/CHANGES [utf-8] (original) +++ httpd/httpd/trunk/CHANGES [utf-8] Tue Oct 11 13:42:33 2016 @@ -1,8 +1,6 @@ -*- coding: utf-8 -*- Changes with Apache 2.5.0 - *) mod_proxy_http2: fixed duplicate symbols with mod_http2. - *) mod_dav: Fix a potential cause of unbounded memory usage or incorrect behavior in a routine that sends 's to the output filters. [Evgeny Kotkov] Modified: httpd/httpd/trunk/modules/http2/h2_version.h URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_version.h?rev=1764243&r1=1764242&r2=1764243&view=diff ============================================================================== --- httpd/httpd/trunk/modules/http2/h2_version.h (original) +++ httpd/httpd/trunk/modules/http2/h2_version.h Tue Oct 11 13:42:33 2016 @@ -26,7 +26,7 @@ * @macro * Version number of the http2 module as c string */ -#define MOD_HTTP2_VERSION "1.7.4-DEV" +#define MOD_HTTP2_VERSION "1.7.5-DEV" /** * @macro @@ -34,7 +34,7 @@ * release. This is a 24 bit number with 8 bits for major number, 8 bits * for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203. */ -#define MOD_HTTP2_VERSION_NUM 0x010704 +#define MOD_HTTP2_VERSION_NUM 0x010705 #endif /* mod_h2_h2_version_h */