diff options
author | Igor Sysoev <igor@sysoev.ru> | 2005-03-22 19:02:46 +0300 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2005-03-22 19:02:46 +0300 |
commit | 4d656dcd0bd6309b0ec76fc444198ed6c2948a8e (patch) | |
tree | 67ce201b7d515273fa2a6a617542cece4fa16898 /auto/lib/pcre | |
parent | 3599a1b885533d929315494258fb407765243a95 (diff) |
nginx-0.1.26-RELEASE importrelease-0.1.26
*) Change: the invalid client header lines are now ignored and logged
at the info level.
*) Change: the server name is also logged in error log.
*) Feature: the ngx_http_auth_basic_module module and the auth_basic
and auth_basic_user_file directives.
Diffstat (limited to 'auto/lib/pcre')
-rw-r--r-- | auto/lib/pcre/make | 8 | ||||
-rw-r--r-- | auto/lib/pcre/makefile.bcc | 1 | ||||
-rw-r--r-- | auto/lib/pcre/makefile.msvc | 1 | ||||
-rw-r--r-- | auto/lib/pcre/makefile.owc | 2 | ||||
-rw-r--r-- | auto/lib/pcre/patch.pcre.c | 13 | ||||
-rw-r--r-- | auto/lib/pcre/patch.pcre.in | 13 | ||||
-rw-r--r-- | auto/lib/pcre/patch.pcre.in.owc | 15 |
7 files changed, 48 insertions, 5 deletions
diff --git a/auto/lib/pcre/make b/auto/lib/pcre/make index 6b5235704..f57f7d9ec 100644 --- a/auto/lib/pcre/make +++ b/auto/lib/pcre/make @@ -6,17 +6,17 @@ case "$NGX_CC_NAME" in msvc*) ngx_makefile=makefile.msvc - ngx_opt="CPU_OPT=$CPU_OPT LIBC=$LIBC" + ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC" ;; owc*) ngx_makefile=makefile.owc - ngx_opt="CPU_OPT=$CPU_OPT" + ngx_opt="CPU_OPT=\"$CPU_OPT\"" ;; bcc) ngx_makefile=makefile.bcc - ngx_opt="-DCPU_OPT=$CPU_OPT" + ngx_opt="-DCPU_OPT=\"$CPU_OPT\"" ;; esac @@ -26,7 +26,9 @@ case "$NGX_PLATFORM" in win32) cp auto/lib/pcre/patch.pcre.in $PCRE + cp auto/lib/pcre/patch.pcre.in.owc $PCRE cp auto/lib/pcre/patch.config.in $PCRE + cp auto/lib/pcre/patch.pcre.c $PCRE cp auto/lib/pcre/$ngx_makefile $PCRE ngx_pcre=`echo $PCRE | sed -e "s/\//$ngx_regex_dirsep/g"` diff --git a/auto/lib/pcre/makefile.bcc b/auto/lib/pcre/makefile.bcc index 411945260..a2dc5fbfc 100644 --- a/auto/lib/pcre/makefile.bcc +++ b/auto/lib/pcre/makefile.bcc @@ -18,3 +18,4 @@ pcre.lib: pcre.h pcre.h: patch -o pcre.h pcre.in patch.pcre.in patch -o config.h config.in patch.config.in + patch -o pcre.c pcre.c patch.pcre.c diff --git a/auto/lib/pcre/makefile.msvc b/auto/lib/pcre/makefile.msvc index 7c61d31f7..4da4e0c39 100644 --- a/auto/lib/pcre/makefile.msvc +++ b/auto/lib/pcre/makefile.msvc @@ -20,3 +20,4 @@ pcre.lib: pcre.h pcre.h: patch -o pcre.h pcre.in patch.pcre.in patch -o config.h config.in patch.config.in + patch -o pcre.c pcre.c patch.pcre.c diff --git a/auto/lib/pcre/makefile.owc b/auto/lib/pcre/makefile.owc index 227fd90af..8439c4cc2 100644 --- a/auto/lib/pcre/makefile.owc +++ b/auto/lib/pcre/makefile.owc @@ -15,5 +15,5 @@ pcre.lib: pcre.h pcre.h: - patch -o pcre.h pcre.in patch.pcre.in + patch -o pcre.h pcre.in patch.pcre.in.owc patch -o config.h config.in patch.config.in diff --git a/auto/lib/pcre/patch.pcre.c b/auto/lib/pcre/patch.pcre.c new file mode 100644 index 000000000..8e56b9df6 --- /dev/null +++ b/auto/lib/pcre/patch.pcre.c @@ -0,0 +1,13 @@ +--- pcre.c Thu Aug 21 14:43:07 2003 ++++ pcre.c Tue Mar 22 12:56:59 2005 +@@ -246,8 +246,8 @@ + extern "C" void (*pcre_free)(void *) = free; + extern "C" int (*pcre_callout)(pcre_callout_block *) = NULL; + #else +-void *(*pcre_malloc)(size_t) = malloc; +-void (*pcre_free)(void *) = free; ++void *(__cdecl *pcre_malloc)(size_t) = malloc; ++void (__cdecl *pcre_free)(void *) = free; + int (*pcre_callout)(pcre_callout_block *) = NULL; + #endif + #endif diff --git a/auto/lib/pcre/patch.pcre.in b/auto/lib/pcre/patch.pcre.in index c49a68f7b..7ae32a998 100644 --- a/auto/lib/pcre/patch.pcre.in +++ b/auto/lib/pcre/patch.pcre.in @@ -1,5 +1,5 @@ --- pcre.in Thu Aug 21 14:43:07 2003 -+++ pcre.in Sun Mar 7 02:10:11 2004 ++++ pcre.h Tue Mar 22 12:56:59 2005 @@ -10,9 +10,9 @@ /* The file pcre.h is build by "configure". Do not edit it; instead make changes to pcre.in. */ @@ -13,3 +13,14 @@ /* Win32 uses DLL by default */ +@@ -143,8 +143,8 @@ + have to be different again. */ + + #ifndef VPCOMPAT +-PCRE_DATA_SCOPE void *(*pcre_malloc)(size_t); +-PCRE_DATA_SCOPE void (*pcre_free)(void *); ++PCRE_DATA_SCOPE void *(__cdecl *pcre_malloc)(size_t); ++PCRE_DATA_SCOPE void (__cdecl *pcre_free)(void *); + PCRE_DATA_SCOPE int (*pcre_callout)(pcre_callout_block *); + #else /* VPCOMPAT */ + extern void *pcre_malloc(size_t); diff --git a/auto/lib/pcre/patch.pcre.in.owc b/auto/lib/pcre/patch.pcre.in.owc new file mode 100644 index 000000000..8adbcbc9f --- /dev/null +++ b/auto/lib/pcre/patch.pcre.in.owc @@ -0,0 +1,15 @@ +--- pcre.in Thu Aug 21 14:43:07 2003 ++++ pcre.h Tue Mar 22 12:56:59 2005 +@@ -10,9 +10,9 @@ + /* The file pcre.h is build by "configure". Do not edit it; instead + make changes to pcre.in. */ + +-#define PCRE_MAJOR @PCRE_MAJOR@ +-#define PCRE_MINOR @PCRE_MINOR@ +-#define PCRE_DATE @PCRE_DATE@ ++#define PCRE_MAJOR 4 ++#define PCRE_MINOR 4 ++#define PCRE_DATE 21-August-2003 + + /* Win32 uses DLL by default */ + |