Skip to content

Commit cf43ce8

Browse files
author
bytesharky
committed
stable-1.26.3
1 parent fe84d28 commit cf43ce8

33 files changed

+31484
-88
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
.github
2+
.hgtags

‎auto/configure‎

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
#!/bin/sh
2+
3+
# Copyright (C) Igor Sysoev
4+
# Copyright (C) Nginx, Inc.
5+
6+
7+
LC_ALL=C
8+
export LC_ALL
9+
10+
. auto/options
11+
. auto/init
12+
. auto/sources
13+
14+
test -d $NGX_OBJS || mkdir -p $NGX_OBJS
15+
16+
echo > $NGX_AUTO_HEADERS_H
17+
echo > $NGX_AUTOCONF_ERR
18+
19+
echo "#define NGX_CONFIGURE \"$NGX_CONFIGURE\"" > $NGX_AUTO_CONFIG_H
20+
21+
22+
if [ $NGX_DEBUG = YES ]; then
23+
have=NGX_DEBUG . auto/have
24+
fi
25+
26+
27+
if test -z "$NGX_PLATFORM"; then
28+
echo "checking for OS"
29+
30+
NGX_SYSTEM=`uname -s 2>/dev/null`
31+
NGX_RELEASE=`uname -r 2>/dev/null`
32+
NGX_MACHINE=`uname -m 2>/dev/null`
33+
34+
echo " + $NGX_SYSTEM $NGX_RELEASE $NGX_MACHINE"
35+
36+
NGX_PLATFORM="$NGX_SYSTEM:$NGX_RELEASE:$NGX_MACHINE";
37+
38+
case "$NGX_SYSTEM" in
39+
MINGW32_* | MINGW64_* | MSYS_*)
40+
NGX_PLATFORM=win32
41+
;;
42+
esac
43+
44+
else
45+
echo "building for $NGX_PLATFORM"
46+
NGX_SYSTEM=$NGX_PLATFORM
47+
NGX_MACHINE=i386
48+
fi
49+
50+
. auto/cc/conf
51+
52+
if [ "$NGX_PLATFORM" != win32 ]; then
53+
. auto/headers
54+
fi
55+
56+
. auto/os/conf
57+
58+
if [ "$NGX_PLATFORM" != win32 ]; then
59+
. auto/unix
60+
fi
61+
62+
. auto/threads
63+
. auto/modules
64+
. auto/lib/conf
65+
66+
case ".$NGX_PREFIX" in
67+
.)
68+
NGX_PREFIX=${NGX_PREFIX:-/usr/local/nginx}
69+
have=NGX_PREFIX value="\"$NGX_PREFIX/\"" . auto/define
70+
;;
71+
72+
.!)
73+
NGX_PREFIX=
74+
;;
75+
76+
*)
77+
have=NGX_PREFIX value="\"$NGX_PREFIX/\"" . auto/define
78+
;;
79+
esac
80+
81+
if [ ".$NGX_CONF_PREFIX" != "." ]; then
82+
have=NGX_CONF_PREFIX value="\"$NGX_CONF_PREFIX/\"" . auto/define
83+
fi
84+
85+
have=NGX_SBIN_PATH value="\"$NGX_SBIN_PATH\"" . auto/define
86+
have=NGX_CONF_PATH value="\"$NGX_CONF_PATH\"" . auto/define
87+
have=NGX_PID_PATH value="\"$NGX_PID_PATH\"" . auto/define
88+
have=NGX_LOCK_PATH value="\"$NGX_LOCK_PATH\"" . auto/define
89+
have=NGX_ERROR_LOG_PATH value="\"$NGX_ERROR_LOG_PATH\"" . auto/define
90+
91+
if [ ".$NGX_ERROR_LOG_PATH" = "." ]; then
92+
have=NGX_ERROR_LOG_STDERR . auto/have
93+
fi
94+
95+
have=NGX_HTTP_LOG_PATH value="\"$NGX_HTTP_LOG_PATH\"" . auto/define
96+
have=NGX_HTTP_CLIENT_TEMP_PATH value="\"$NGX_HTTP_CLIENT_TEMP_PATH\""
97+
. auto/define
98+
have=NGX_HTTP_PROXY_TEMP_PATH value="\"$NGX_HTTP_PROXY_TEMP_PATH\""
99+
. auto/define
100+
have=NGX_HTTP_FASTCGI_TEMP_PATH value="\"$NGX_HTTP_FASTCGI_TEMP_PATH\""
101+
. auto/define
102+
have=NGX_HTTP_UWSGI_TEMP_PATH value="\"$NGX_HTTP_UWSGI_TEMP_PATH\""
103+
. auto/define
104+
have=NGX_HTTP_SCGI_TEMP_PATH value="\"$NGX_HTTP_SCGI_TEMP_PATH\""
105+
. auto/define
106+
107+
. auto/make
108+
. auto/lib/make
109+
. auto/install
110+
111+
# STUB
112+
. auto/stubs
113+
114+
have=NGX_USER value="\"$NGX_USER\"" . auto/define
115+
have=NGX_GROUP value="\"$NGX_GROUP\"" . auto/define
116+
117+
if [ ".$NGX_BUILD" != "." ]; then
118+
have=NGX_BUILD value="\"$NGX_BUILD\"" . auto/define
119+
fi
120+
121+
. auto/summary

‎auto/lib/libatomic/conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ if [ $NGX_LIBATOMIC != YES ]; then
77

88
have=NGX_HAVE_LIBATOMIC . auto/have
99
CORE_INCS="$CORE_INCS $NGX_LIBATOMIC/src"
10-
LINK_DEPS="$LINK_DEPS $NGX_LIBATOMIC/src/libatomic_ops.a"
11-
CORE_LIBS="$CORE_LIBS $NGX_LIBATOMIC/src/libatomic_ops.a"
10+
LINK_DEPS="$LINK_DEPS $NGX_LIBATOMIC/build/lib/libatomic_ops.a"
11+
CORE_LIBS="$CORE_LIBS $NGX_LIBATOMIC/build/lib/libatomic_ops.a"
1212

1313
else
1414

‎auto/lib/libatomic/make‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,19 @@
33
# Copyright (C) Nginx, Inc.
44

55

6+
case $NGX_LIBATOMIC in
7+
/*) ngx_prefix="$NGX_LIBATOMIC/build" ;;
8+
*) ngx_prefix="$PWD/$NGX_LIBATOMIC/build" ;;
9+
esac
10+
611
cat << END >> $NGX_MAKEFILE
712

8-
$NGX_LIBATOMIC/src/libatomic_ops.a: $NGX_LIBATOMIC/Makefile
9-
cd $NGX_LIBATOMIC && \$(MAKE)
13+
$NGX_LIBATOMIC/build/lib/libatomic_ops.a: $NGX_LIBATOMIC/Makefile
14+
cd $NGX_LIBATOMIC && \$(MAKE) && \$(MAKE) install
1015

1116
$NGX_LIBATOMIC/Makefile: $NGX_MAKEFILE
1217
cd $NGX_LIBATOMIC \\
1318
&& if [ -f Makefile ]; then \$(MAKE) distclean; fi \\
14-
&& ./configure
19+
&& ./configure --prefix=$ngx_prefix
1520

1621
END

‎auto/lib/pcre/make‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ if [ $PCRE_LIBRARY = PCRE2 ]; then
3636
pcre2_valid_utf.c \
3737
pcre2_xclass.c"
3838

39-
ngx_pcre_test="pcre2_convert.c \
39+
ngx_pcre_test="pcre2_chkdint.c \
40+
pcre2_convert.c \
4041
pcre2_extuni.c \
4142
pcre2_find_bracket.c \
4243
pcre2_script_run.c \

‎docs/GNUmakefile‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
2+
VER= $(shell grep 'define NGINX_VERSION' src/core/nginx.h \
3+
| sed -e 's/^.*"\(.*\)".*/\1/')
4+
NGINX= nginx-$(VER)
5+
TEMP= tmp
6+
XSLS?= xslscript.pl
7+
8+
9+
all: changes
10+
11+
changes: $(TEMP)/$(NGINX)/CHANGES.ru \
12+
$(TEMP)/$(NGINX)/CHANGES
13+
14+
15+
$(TEMP)/$(NGINX)/CHANGES.ru: docs/dtd/changes.dtd \
16+
docs/xml/nginx/changes.xml \
17+
docs/xml/change_log_conf.xml \
18+
docs/xslt/changes.xslt
19+
20+
mkdir -p $(TEMP)/$(NGINX)
21+
22+
xmllint --noout --valid docs/xml/nginx/changes.xml
23+
xsltproc --stringparam lang ru \
24+
-o $@ docs/xslt/changes.xslt docs/xml/nginx/changes.xml
25+
26+
27+
$(TEMP)/$(NGINX)/CHANGES: docs/dtd/changes.dtd \
28+
docs/xml/nginx/changes.xml \
29+
docs/xml/change_log_conf.xml \
30+
docs/xslt/changes.xslt
31+
32+
mkdir -p $(TEMP)/$(NGINX)
33+
34+
xmllint --noout --valid docs/xml/nginx/changes.xml
35+
xsltproc --stringparam lang en \
36+
-o $@ docs/xslt/changes.xslt docs/xml/nginx/changes.xml
37+
38+
39+
docs/xslt/changes.xslt: docs/xsls/changes.xsls
40+
41+
$(XSLS) -o $@ $<

‎docs/dtd/change_log_conf.dtd‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
2+
<!ELEMENT configuration (length, start, indent, changes+) >
3+
4+
<!ELEMENT length (#PCDATA) >
5+
<!ELEMENT start (#PCDATA) >
6+
<!ELEMENT indent (#PCDATA) >
7+
8+
<!ELEMENT changes (title, length,
9+
bugfix, feature, change, workaround,
10+
(month, month, month, month, month, month,
11+
month, month, month, month, month, month)?) >
12+
13+
<!ATTLIST changes lang ( ru | en) #REQUIRED>
14+
15+
<!ELEMENT title (#PCDATA) >
16+
17+
<!ELEMENT bugfix (#PCDATA) >
18+
<!ELEMENT feature (#PCDATA) >
19+
<!ELEMENT change (#PCDATA) >
20+
<!ELEMENT workaround (#PCDATA) >
21+
22+
<!ELEMENT month (#PCDATA) >

‎docs/dtd/changes.dtd‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
2+
<!ENTITY nbsp "&#xA0;" >
3+
<!ENTITY mdash "&#xA0;- " >
4+
5+
6+
<!ELEMENT change_log (changes)* >
7+
<!ATTLIST change_log title CDATA #REQUIRED >
8+
9+
<!ELEMENT changes (change)* >
10+
<!ATTLIST changes ver CDATA #REQUIRED
11+
date CDATA #REQUIRED
12+
>
13+
14+
<!ELEMENT change (para)* >
15+
<!ATTLIST change type (bugfix | feature | change | security | workaround) #IMPLIED >
16+
17+
<!ELEMENT para (#PCDATA | at | br | nobr)* >
18+
<!ATTLIST para lang (ru | en) #REQUIRED >
19+
20+
<!ELEMENT at EMPTY >
21+
<!ELEMENT br EMPTY >
22+
<!ELEMENT nobr (#PCDATA) >

‎docs/html/50x.html‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<title>Error</title>
5+
<style>
6+
html { color-scheme: light dark; }
7+
body { width: 35em; margin: 0 auto;
8+
font-family: Tahoma, Verdana, Arial, sans-serif; }
9+
</style>
10+
</head>
11+
<body>
12+
<h1>An error occurred.</h1>
13+
<p>Sorry, the page you are looking for is currently unavailable.<br/>
14+
Please try again later.</p>
15+
<p>If you are the system administrator of this resource then you should check
16+
the error log for details.</p>
17+
<p><em>Faithfully yours, nginx.</em></p>
18+
</body>
19+
</html>

‎docs/html/index.html‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<title>Welcome to nginx!</title>
5+
<style>
6+
html { color-scheme: light dark; }
7+
body { width: 35em; margin: 0 auto;
8+
font-family: Tahoma, Verdana, Arial, sans-serif; }
9+
</style>
10+
</head>
11+
<body>
12+
<h1>Welcome to nginx!</h1>
13+
<p>If you see this page, the nginx web server is successfully installed and
14+
working. Further configuration is required.</p>
15+
16+
<p>For online documentation and support please refer to
17+
<a href="http://nginx.org/">nginx.org</a>.<br/>
18+
Commercial support is available at
19+
<a href="http://nginx.com/">nginx.com</a>.</p>
20+
21+
<p><em>Thank you for using nginx.</em></p>
22+
</body>
23+
</html>

0 commit comments

Comments
 (0)