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 B076918254 for ; Fri, 18 Sep 2015 15:30:50 +0000 (UTC) Received: (qmail 35712 invoked by uid 500); 18 Sep 2015 15:30:50 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 35661 invoked by uid 500); 18 Sep 2015 15:30:50 -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 35652 invoked by uid 99); 18 Sep 2015 15:30:50 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Sep 2015 15:30:50 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 3311BF3FFD for ; Fri, 18 Sep 2015 15:30:50 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 3.5 X-Spam-Level: *** X-Spam-Status: No, score=3.5 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RDNS_NONE=2.5] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id VuXaZkkbZvup for ; Fri, 18 Sep 2015 15:30:49 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (unknown [209.188.14.139]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with ESMTP id 7637742BDE for ; Fri, 18 Sep 2015 15:30:49 +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 14E56E0687 for ; Fri, 18 Sep 2015 15:30:49 +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 112D73A0181 for ; Fri, 18 Sep 2015 15:30:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1703888 - /apr/apr/branches/1.6.x/include/apr_portable.h Date: Fri, 18 Sep 2015 15:30:49 -0000 To: commits@apr.apache.org From: minfrin@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150918153049.112D73A0181@svn01-us-west.apache.org> Author: minfrin Date: Fri Sep 18 15:30:48 2015 New Revision: 1703888 URL: http://svn.apache.org/viewvc?rev=1703888&view=rev Log: Clarify under what circumstances memory is allocated in apr_os_sock_put(). Modified: apr/apr/branches/1.6.x/include/apr_portable.h Modified: apr/apr/branches/1.6.x/include/apr_portable.h URL: http://svn.apache.org/viewvc/apr/apr/branches/1.6.x/include/apr_portable.h?rev=1703888&r1=1703887&r2=1703888&view=diff ============================================================================== --- apr/apr/branches/1.6.x/include/apr_portable.h (original) +++ apr/apr/branches/1.6.x/include/apr_portable.h Fri Sep 18 15:30:48 2015 @@ -380,7 +380,10 @@ APR_DECLARE(apr_status_t) apr_os_dir_put apr_pool_t *cont); /** - * Convert a socket from the os specific type to the apr type + * Convert a socket from the os specific type to the APR type. If + * sock points to NULL, a socket will be created from the pool + * provided. If **sock does not point to NULL, the structure pointed + * to by sock will be reused and updated with the given socket. * @param sock The pool to use. * @param thesock The socket to convert to. * @param cont The socket we are converting to an apr type.