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 7D281200BC2 for ; Thu, 17 Nov 2016 13:09:46 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 7BD1F160B0B; Thu, 17 Nov 2016 12:09:46 +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 C45BB160AFF for ; Thu, 17 Nov 2016 13:09:45 +0100 (CET) Received: (qmail 28340 invoked by uid 500); 17 Nov 2016 12:09:44 -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 28331 invoked by uid 99); 17 Nov 2016 12:09:44 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Nov 2016 12:09:44 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 5B28A180538 for ; Thu, 17 Nov 2016 12:09:44 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -1.999 X-Spam-Level: X-Spam-Status: No, score=-1.999 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id faMao3H9g_AW for ; Thu, 17 Nov 2016 12:09:43 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTP id 676A35FAE7 for ; Thu, 17 Nov 2016 12:09:43 +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 7655AE0054 for ; Thu, 17 Nov 2016 12:09:33 +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 333EC3A0EB1 for ; Thu, 17 Nov 2016 12:09:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1770173 - /httpd/httpd/branches/2.4.x-merge-http-strict/include/httpd.h Date: Thu, 17 Nov 2016 12:09:32 -0000 To: cvs@httpd.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20161117120933.333EC3A0EB1@svn01-us-west.apache.org> archived-at: Thu, 17 Nov 2016 12:09:46 -0000 Author: wrowe Date: Thu Nov 17 12:09:32 2016 New Revision: 1770173 URL: http://svn.apache.org/viewvc?rev=1770173&view=rev Log: Merge of r1765451 did not apply cleanly, drop unneeded prototype. Modified: httpd/httpd/branches/2.4.x-merge-http-strict/include/httpd.h Modified: httpd/httpd/branches/2.4.x-merge-http-strict/include/httpd.h URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-merge-http-strict/include/httpd.h?rev=1770173&r1=1770172&r2=1770173&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x-merge-http-strict/include/httpd.h (original) +++ httpd/httpd/branches/2.4.x-merge-http-strict/include/httpd.h Thu Nov 17 12:09:32 2016 @@ -2339,15 +2339,6 @@ AP_DECLARE(char *) ap_get_exec_line(apr_ const char *cmd, const char * const *argv); -/** - * Check if string contains a control character - * @param str the string to check - * @param srclen length of the data - * @return 1 if yes, 0 if no control characters - */ -AP_DECLARE(int) ap_has_cntrl(const char *str) - AP_FN_ATTR_NONNULL_ALL; - #define AP_NORESTART APR_OS_START_USEERR + 1 /**