diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2005-03-22 16:02:46 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2005-03-22 16:02:46 +0000 |
| commit | 4d656dcd0bd6309b0ec76fc444198ed6c2948a8e (patch) | |
| tree | 67ce201b7d515273fa2a6a617542cece4fa16898 /auto/lib/pcre/patch.pcre.in | |
| parent | 3599a1b885533d929315494258fb407765243a95 (diff) | |
| download | nginx-release-0.1.26.tar.gz nginx-release-0.1.26.tar.bz2 | |
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 '')
| -rw-r--r-- | auto/lib/pcre/patch.pcre.in | 13 | ||||
| -rw-r--r-- | auto/lib/pcre/patch.pcre.in.owc | 15 |
2 files changed, 27 insertions, 1 deletions
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 */ + |