IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

nginx-0.1.26-RELEASE import

Browse Source 
*) 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.
This commit is contained in:
Igor Sysoev
2005-03-22 16:02:46 +00:00
parent 3599a1b885
commit 4d656dcd0b
53 changed files with 880 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
auto/lib/md5/make
View File

@@ -6,17 +6,17 @@ case "$NGX_CC_NAME" in
msvc*)
ngx_makefile=makefile.msvc
ngx_opt="CPU_OPT=$CPU_OPT LIBC=$LIBC MD5_ASM=$MD5_ASM"
ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC MD5_ASM=$MD5_ASM"
;;
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 -DMD5_ASM=$MD5_ASM"
ngx_opt="-DCPU_OPT=\"$CPU_OPT\" -DMD5_ASM=$MD5_ASM"
;;
esac

8
auto/lib/pcre/make
View File

@@ -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"`

1
auto/lib/pcre/makefile.bcc
View File

@@ -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

1
auto/lib/pcre/makefile.msvc
View File

@@ -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

2
auto/lib/pcre/makefile.owc
View File

@@ -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

13
auto/lib/pcre/patch.pcre.c Normal file
View File

@@ -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

13
auto/lib/pcre/patch.pcre.in
View File

@@ -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);

15
auto/lib/pcre/patch.pcre.in.owc Normal file
View File

@@ -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 */

6
auto/lib/zlib/make
View File

@@ -6,18 +6,18 @@ 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

10
auto/lib/zlib/patch.zlib.h Normal file
View File

@@ -0,0 +1,10 @@
--- zlib.h Thu Jul 9 20:06:56 1998
+++ zlib-1.1.3/zlib.h Tue Mar 22 13:41:04 2005
@@ -709,7 +709,6 @@
(0 in case of error).
*/
-ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...));
/*
Converts, formats, and writes the args to the compressed file under
control of the format string, as in fprintf. gzprintf returns the number of