Return-Path: X-Original-To: apmail-apr-commits-archive@www.apache.org Delivered-To: apmail-apr-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 389F5D68C for ; Sat, 3 Nov 2012 19:05:54 +0000 (UTC) Received: (qmail 1604 invoked by uid 500); 3 Nov 2012 19:05:53 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 1541 invoked by uid 500); 3 Nov 2012 19:05:53 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 1528 invoked by uid 99); 3 Nov 2012 19:05:53 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 03 Nov 2012 19:05:53 +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; Sat, 03 Nov 2012 19:05:50 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id EE03923888CD for ; Sat, 3 Nov 2012 19:05:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1405402 - in /apr/apr/trunk: CHANGES include/apr_network_io.h network_io/unix/sockopt.c Date: Sat, 03 Nov 2012 19:05:29 -0000 To: commits@apr.apache.org From: trawick@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121103190529.EE03923888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: trawick Date: Sat Nov 3 19:05:29 2012 New Revision: 1405402 URL: http://svn.apache.org/viewvc?rev=1405402&view=rev Log: apr_socket_accept_filter(): The 2nd and 3rd arguments are now const char * instead of char *. Modified: apr/apr/trunk/CHANGES apr/apr/trunk/include/apr_network_io.h apr/apr/trunk/network_io/unix/sockopt.c Modified: apr/apr/trunk/CHANGES URL: http://svn.apache.org/viewvc/apr/apr/trunk/CHANGES?rev=1405402&r1=1405401&r2=1405402&view=diff ============================================================================== --- apr/apr/trunk/CHANGES [utf-8] (original) +++ apr/apr/trunk/CHANGES [utf-8] Sat Nov 3 19:05:29 2012 @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes for APR 2.0.0 + *) apr_socket_accept_filter(): The 2nd and 3rd arguments are now + const char * instead of char *. [Jeff Trawick] + *) Fix potential data corruption in apr_brigade_write() and friends if the last bucket of the brigade is a heap bucket that has been split, and there are still references to the next part of the original bucket Modified: apr/apr/trunk/include/apr_network_io.h URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_network_io.h?rev=1405402&r1=1405401&r2=1405402&view=diff ============================================================================== --- apr/apr/trunk/include/apr_network_io.h (original) +++ apr/apr/trunk/include/apr_network_io.h Sat Nov 3 19:05:29 2012 @@ -798,8 +798,8 @@ APR_DECLARE(int) apr_ipsubnet_test(apr_i * @param args Any extra args to the accept filter. Passing NULL here removes * the accept filter. */ -apr_status_t apr_socket_accept_filter(apr_socket_t *sock, char *name, - char *args); +apr_status_t apr_socket_accept_filter(apr_socket_t *sock, const char *name, + const char *args); #endif /** Modified: apr/apr/trunk/network_io/unix/sockopt.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/network_io/unix/sockopt.c?rev=1405402&r1=1405401&r2=1405402&view=diff ============================================================================== --- apr/apr/trunk/network_io/unix/sockopt.c (original) +++ apr/apr/trunk/network_io/unix/sockopt.c Sat Nov 3 19:05:29 2012 @@ -393,8 +393,8 @@ apr_status_t apr_gethostname(char *buf, } #if APR_HAS_SO_ACCEPTFILTER -apr_status_t apr_socket_accept_filter(apr_socket_t *sock, char *name, - char *args) +apr_status_t apr_socket_accept_filter(apr_socket_t *sock, const char *name, + const char *args) { struct accept_filter_arg af; strncpy(af.af_name, name, 16);