Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 62328 invoked from network); 11 Sep 2006 11:08:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 11 Sep 2006 11:08:55 -0000 Received: (qmail 56213 invoked by uid 500); 11 Sep 2006 11:08:54 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 55233 invoked by uid 500); 11 Sep 2006 11:08:51 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 55222 invoked by uid 500); 11 Sep 2006 11:08:51 -0000 Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org Received: (qmail 55219 invoked by uid 99); 11 Sep 2006 11:08:51 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Sep 2006 04:08:51 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME,UPPERCASE_25_50 X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Sep 2006 04:08:50 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 8EE9D1A981A; Mon, 11 Sep 2006 04:08:30 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r442173 - in /tomcat/connectors/trunk/jk/native/iis: isapi.dsp isapi.dsw pcre/pcreposix.dsp pcre/pcreposix.h Date: Mon, 11 Sep 2006 11:08:30 -0000 To: tomcat-dev@jakarta.apache.org From: mturk@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060911110830.8EE9D1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: mturk Date: Mon Sep 11 04:08:29 2006 New Revision: 442173 URL: http://svn.apache.org/viewvc?view=rev&rev=442173 Log: Update pcre libray dependency. Added: tomcat/connectors/trunk/jk/native/iis/pcre/pcreposix.h (with props) Modified: tomcat/connectors/trunk/jk/native/iis/isapi.dsp tomcat/connectors/trunk/jk/native/iis/isapi.dsw tomcat/connectors/trunk/jk/native/iis/pcre/pcreposix.dsp Modified: tomcat/connectors/trunk/jk/native/iis/isapi.dsp URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/isapi.dsp?view=diff&rev=442173&r1=442172&r2=442173 ============================================================================== --- tomcat/connectors/trunk/jk/native/iis/isapi.dsp (original) +++ tomcat/connectors/trunk/jk/native/iis/isapi.dsp Mon Sep 11 04:08:29 2006 @@ -43,7 +43,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ISAPI_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /Zi /O2 /I "..\common" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "ISAPI_EXPORTS" /Fd"Release/isapi_redirector_src" /FD /c +# ADD CPP /nologo /MD /W3 /Zi /O2 /I "..\common" /I "pcre" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "ISAPI_EXPORTS" /D "HAS_PCRE" /Fd"Release/isapi_redirector_src" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" @@ -69,7 +69,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ISAPI_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\common" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug/isapi_redirector_src" /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\common" /I "pcre" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "ISAPI_EXPORTS" /D "HAS_PCRE" /Fd"Debug/isapi_redirector_src" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" Modified: tomcat/connectors/trunk/jk/native/iis/isapi.dsw URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/isapi.dsw?view=diff&rev=442173&r1=442172&r2=442173 ============================================================================== --- tomcat/connectors/trunk/jk/native/iis/isapi.dsw (original) +++ tomcat/connectors/trunk/jk/native/iis/isapi.dsw Mon Sep 11 04:08:29 2006 @@ -3,6 +3,18 @@ ############################################################################### +Project: "dftables"=".\pcre\dftables.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "isapi"=".\isapi.dsp" - Package Owner=<4> Package=<5> @@ -11,6 +23,24 @@ Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name pcre + End Project Dependency +}}} + +############################################################################### + +Project: "pcre"=".\pcre\pcre.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name dftables + End Project Dependency }}} ############################################################################### Modified: tomcat/connectors/trunk/jk/native/iis/pcre/pcreposix.dsp URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/pcre/pcreposix.dsp?view=diff&rev=442173&r1=442172&r2=442173 ============================================================================== --- tomcat/connectors/trunk/jk/native/iis/pcre/pcreposix.dsp (original) +++ tomcat/connectors/trunk/jk/native/iis/pcre/pcreposix.dsp Mon Sep 11 04:08:29 2006 @@ -41,7 +41,7 @@ # PROP Intermediate_Dir "LibR" # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /O2 /D "_WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PCRE_STATIC" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "..\..\include" /D "_WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PCRE_STATIC" /Fd"LibR/pcreposix_src" /FD /c +# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /D "_WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PCRE_STATIC" /Fd"LibR/pcreposix_src" /FD /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -63,8 +63,8 @@ # PROP Output_Dir "LibD" # PROP Intermediate_Dir "LibD" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "_WIN32" /D "_DEBUG" /D "_WINDOWS" /D "PCRE_STATIC" /FD /c -# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "..\..\include" /D "_WIN32" /D "_DEBUG" /D "_WINDOWS" /D "PCRE_STATIC" /Fd"LibD/pcreposix_src" /FD /c +# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "_WIN32" /D "_DEBUG" /D "_WINDOWS" /D "PCRE_STATIC" /FD /EHsc /c +# ADD CPP /nologo /MDd /W3 /Zi /Od /I "..\..\include" /D "_WIN32" /D "_DEBUG" /D "_WINDOWS" /D "PCRE_STATIC" /Fd"LibD/pcreposix_src" /FD /EHsc /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe Added: tomcat/connectors/trunk/jk/native/iis/pcre/pcreposix.h URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/pcre/pcreposix.h?view=auto&rev=442173 ============================================================================== --- tomcat/connectors/trunk/jk/native/iis/pcre/pcreposix.h (added) +++ tomcat/connectors/trunk/jk/native/iis/pcre/pcreposix.h Mon Sep 11 04:08:29 2006 @@ -0,0 +1,99 @@ +/************************************************* +* Perl-Compatible Regular Expressions * +*************************************************/ + +/* Copyright (c) 1997-2000 University of Cambridge */ + +/** + * @file include/pcreposix.h + * @brief PCRE definitions + */ + +#ifndef _PCREPOSIX_H +#define _PCREPOSIX_H + +/* This is the header for the POSIX wrapper interface to the PCRE Perl- +Compatible Regular Expression library. It defines the things POSIX says should +be there. I hope. */ + +/* Have to include stdlib.h in order to ensure that size_t is defined. */ + +#include + +/* Allow for C++ users */ + +#ifdef __cplusplus +extern "C" { +#endif + +/* Options defined by POSIX. */ + + /** Ignore case */ +#define REG_ICASE 0x01 + /** Don't match newlines with wildcards */ +#define REG_NEWLINE 0x02 + /** Don't match BOL */ +#define REG_NOTBOL 0x04 + /** Don't match EOL */ +#define REG_NOTEOL 0x08 + +/* These are not used by PCRE, but by defining them we make it easier +to slot PCRE into existing programs that make POSIX calls. */ + + /** UNUSED! */ +#define REG_EXTENDED 0 + /** UNUSED! */ +#define REG_NOSUB 0 + +/* Error values. Not all these are relevant or used by the wrapper. */ + +enum { + REG_ASSERT = 1, /* internal error ? */ + REG_BADBR, /* invalid repeat counts in {} */ + REG_BADPAT, /* pattern error */ + REG_BADRPT, /* ? * + invalid */ + REG_EBRACE, /* unbalanced {} */ + REG_EBRACK, /* unbalanced [] */ + REG_ECOLLATE, /* collation error - not relevant */ + REG_ECTYPE, /* bad class */ + REG_EESCAPE, /* bad escape sequence */ + REG_EMPTY, /* empty expression */ + REG_EPAREN, /* unbalanced () */ + REG_ERANGE, /* bad range inside [] */ + REG_ESIZE, /* expression too big */ + REG_ESPACE, /* failed to get memory */ + REG_ESUBREG, /* bad back reference */ + REG_INVARG, /* bad argument */ + REG_NOMATCH /* match failed */ +}; + + +/* The structure representing a compiled regular expression. */ + +typedef struct { + void *re_pcre; + size_t re_nsub; + size_t re_erroffset; +} regex_t; + +/* The structure in which a captured offset is returned. */ + +typedef int regoff_t; + +typedef struct { + regoff_t rm_so; + regoff_t rm_eo; +} regmatch_t; + +/* The functions */ + +extern int regcomp(regex_t *, const char *, int); +extern int regexec(const regex_t *, const char *, size_t, regmatch_t *, int); +extern size_t regerror(int, const regex_t *, char *, size_t); +extern void regfree(regex_t *); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* End of pcreposix.h */ Propchange: tomcat/connectors/trunk/jk/native/iis/pcre/pcreposix.h ------------------------------------------------------------------------------ svn:eol-style = native --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org