Mercurial > hg > nginx
annotate auto/cc/name @ 7604:7aa20af4ac00
Rewrite: fixed segfault with rewritten URI and "alias".
The "alias" directive cannot be used in the same location where URI
was rewritten. This has been detected in the "rewrite ... break"
case, but not when the standalone "break" directive was used.
This change also fixes proxy_pass with URI component in a similar
case:
location /aaa/ {
rewrite ^ /xxx/yyy;
break;
proxy_pass http://localhost:8080/bbb/;
}
Previously, the "/bbb/yyy" would be sent to a backend instead of
"/xxx/yyy". And if location's prefix was longer than the rewritten
URI, a segmentation fault might occur.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Mon, 16 Dec 2019 15:19:01 +0300 |
parents | 325b3042edd6 |
children |
rev | line source |
---|---|
455 | 1 |
2 # Copyright (C) Igor Sysoev | |
4412 | 3 # Copyright (C) Nginx, Inc. |
455 | 4 |
5 | |
946 | 6 if [ "$NGX_PLATFORM" != win32 ]; then |
7 | |
8 ngx_feature="C compiler" | |
9 ngx_feature_name= | |
10 ngx_feature_run=yes | |
11 ngx_feature_incs= | |
12 ngx_feature_path= | |
13 ngx_feature_libs= | |
14 ngx_feature_test= | |
15 . auto/feature | |
16 | |
17 if [ $ngx_found = no ]; then | |
18 echo | |
19 echo $0: error: C compiler $CC is not found | |
20 echo | |
21 exit 1 | |
22 fi | |
23 | |
24 fi | |
455 | 25 |
26 | |
577 | 27 if [ "$CC" = cl ]; then |
6397
78f8ac479735
Win32: simplified and improved handling of MSVC versions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5187
diff
changeset
|
28 NGX_CC_NAME=msvc |
78f8ac479735
Win32: simplified and improved handling of MSVC versions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5187
diff
changeset
|
29 echo " + using Microsoft Visual C++ compiler" |
455 | 30 |
4758
1f908d2dde8d
Replaced a number of "else if" with "elif".
Ruslan Ermilov <ru@nginx.com>
parents:
4492
diff
changeset
|
31 elif [ "$CC" = wcl386 ]; then |
455 | 32 NGX_CC_NAME=owc |
946 | 33 echo " + using Open Watcom C compiler" |
455 | 34 |
4758
1f908d2dde8d
Replaced a number of "else if" with "elif".
Ruslan Ermilov <ru@nginx.com>
parents:
4492
diff
changeset
|
35 elif [ "$CC" = bcc32 ]; then |
455 | 36 NGX_CC_NAME=bcc |
946 | 37 echo " + using Borland C++ compiler" |
455 | 38 |
4758
1f908d2dde8d
Replaced a number of "else if" with "elif".
Ruslan Ermilov <ru@nginx.com>
parents:
4492
diff
changeset
|
39 elif `$CC -V 2>&1 | grep '^Intel(R) C' >/dev/null 2>&1`; then |
4492
4871a7dc12a9
Configure: moved icc detection before gcc.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
40 NGX_CC_NAME=icc |
4871a7dc12a9
Configure: moved icc detection before gcc.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
41 echo " + using Intel C++ compiler" |
4871a7dc12a9
Configure: moved icc detection before gcc.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
42 |
4758
1f908d2dde8d
Replaced a number of "else if" with "elif".
Ruslan Ermilov <ru@nginx.com>
parents:
4492
diff
changeset
|
43 elif `$CC -v 2>&1 | grep 'gcc version' >/dev/null 2>&1`; then |
455 | 44 NGX_CC_NAME=gcc |
946 | 45 echo " + using GNU C compiler" |
455 | 46 |
7161
325b3042edd6
Configure: fixed clang detection on MINIX.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6397
diff
changeset
|
47 elif `$CC -v 2>&1 | grep 'clang version' >/dev/null 2>&1`; then |
325b3042edd6
Configure: fixed clang detection on MINIX.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6397
diff
changeset
|
48 NGX_CC_NAME=clang |
325b3042edd6
Configure: fixed clang detection on MINIX.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6397
diff
changeset
|
49 echo " + using Clang C compiler" |
325b3042edd6
Configure: fixed clang detection on MINIX.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6397
diff
changeset
|
50 |
325b3042edd6
Configure: fixed clang detection on MINIX.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6397
diff
changeset
|
51 elif `$CC -v 2>&1 | grep 'LLVM version' >/dev/null 2>&1`; then |
4762
182aee3b1bf5
Added the Clang compiler support.
Ruslan Ermilov <ru@nginx.com>
parents:
4758
diff
changeset
|
52 NGX_CC_NAME=clang |
182aee3b1bf5
Added the Clang compiler support.
Ruslan Ermilov <ru@nginx.com>
parents:
4758
diff
changeset
|
53 echo " + using Clang C compiler" |
182aee3b1bf5
Added the Clang compiler support.
Ruslan Ermilov <ru@nginx.com>
parents:
4758
diff
changeset
|
54 |
4758
1f908d2dde8d
Replaced a number of "else if" with "elif".
Ruslan Ermilov <ru@nginx.com>
parents:
4492
diff
changeset
|
55 elif `$CC -V 2>&1 | grep 'Sun C' >/dev/null 2>&1`; then |
561 | 56 NGX_CC_NAME=sunc |
946 | 57 echo " + using Sun C compiler" |
561 | 58 |
4758
1f908d2dde8d
Replaced a number of "else if" with "elif".
Ruslan Ermilov <ru@nginx.com>
parents:
4492
diff
changeset
|
59 elif `$CC -V 2>&1 | grep '^Compaq C' >/dev/null 2>&1`; then |
455 | 60 NGX_CC_NAME=ccc |
946 | 61 echo " + using Compaq C compiler" |
455 | 62 |
4758
1f908d2dde8d
Replaced a number of "else if" with "elif".
Ruslan Ermilov <ru@nginx.com>
parents:
4492
diff
changeset
|
63 elif `$CC -V 2>&1 | grep '^aCC: ' >/dev/null 2>&1`; then |
455 | 64 NGX_CC_NAME=acc |
946 | 65 echo " + using HP aC++ compiler" |
455 | 66 |
67 else | |
517 | 68 NGX_CC_NAME=unknown |
455 | 69 |
4758
1f908d2dde8d
Replaced a number of "else if" with "elif".
Ruslan Ermilov <ru@nginx.com>
parents:
4492
diff
changeset
|
70 fi |