Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 63580 invoked from network); 3 Aug 2005 09:46:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 3 Aug 2005 09:46:23 -0000 Received: (qmail 90747 invoked by uid 500); 3 Aug 2005 09:46:14 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 90648 invoked by uid 500); 3 Aug 2005 09:46:13 -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 90611 invoked by uid 99); 3 Aug 2005 09:46:13 -0000 X-ASF-Spam-Status: No, hits=-9.6 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME,UPPERCASE_25_50 X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 03 Aug 2005 02:46:02 -0700 Received: (qmail 63404 invoked by uid 65534); 3 Aug 2005 09:46:00 -0000 Message-ID: <20050803094600.63403.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r227189 - /httpd/httpd/trunk/server/util_pcre.c Date: Wed, 03 Aug 2005 09:46:00 -0000 To: cvs@httpd.apache.org From: jorton@apache.org X-Mailer: svnmailer-1.0.3 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jorton Date: Wed Aug 3 02:45:57 2005 New Revision: 227189 URL: http://svn.apache.org/viewcvs?rev=227189&view=rev Log: * server/util_pcre.c (ap_regexec): Fix --with-pcre build with older versions of pcre. Modified: httpd/httpd/trunk/server/util_pcre.c Modified: httpd/httpd/trunk/server/util_pcre.c URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/server/util_pcre.c?rev=227189&r1=227188&r2=227189&view=diff ============================================================================== --- httpd/httpd/trunk/server/util_pcre.c (original) +++ httpd/httpd/trunk/server/util_pcre.c Wed Aug 3 02:45:57 2005 @@ -213,9 +213,15 @@ case PCRE_ERROR_BADMAGIC: return AP_REG_INVARG; case PCRE_ERROR_UNKNOWN_NODE: return AP_REG_ASSERT; case PCRE_ERROR_NOMEMORY: return AP_REG_ESPACE; +#ifdef PCRE_ERROR_MATCHLIMIT case PCRE_ERROR_MATCHLIMIT: return AP_REG_ESPACE; +#endif +#ifdef PCRE_ERROR_BADUTF8 case PCRE_ERROR_BADUTF8: return AP_REG_INVARG; +#endif +#ifdef PCRE_ERROR_BADUTF8_OFFSET case PCRE_ERROR_BADUTF8_OFFSET: return AP_REG_INVARG; +#endif default: return AP_REG_ASSERT; } }