comparison image_filter_finalize.t @ 974:882267679006

Tests: simplified parallel modifications in tests. Mail tests were simplified in c227348453db.
author Andrey Zelenkov <zelenkov@nginx.com>
date Tue, 12 Jul 2016 17:39:03 +0300
parents e9064d691790
children 196d33c2bb45
comparison
equal deleted inserted replaced
973:7d7aef8b9f3a 974:882267679006
41 41
42 log_format time "$request_uri:$status:$upstream_response_time"; 42 log_format time "$request_uri:$status:$upstream_response_time";
43 access_log time.log time; 43 access_log time.log time;
44 44
45 upstream u { 45 upstream u {
46 server 127.0.0.1:%%PORT_1%%; 46 server 127.0.0.1:8081;
47 server 127.0.0.1:%%PORT_1%%; 47 server 127.0.0.1:8081;
48 server 127.0.0.1:%%PORT_1%%; 48 server 127.0.0.1:8081;
49 server 127.0.0.1:%%PORT_1%%; 49 server 127.0.0.1:8081;
50 server 127.0.0.1:%%PORT_0%%; 50 server 127.0.0.1:8080;
51 } 51 }
52 52
53 server { 53 server {
54 listen 127.0.0.1:%%PORT_0%%; 54 listen 127.0.0.1:8080;
55 server_name localhost; 55 server_name localhost;
56 56
57 # this used to cause a segmentation fault before 07f028df3879 (1.3.1) 57 # this used to cause a segmentation fault before 07f028df3879 (1.3.1)
58 # http://nginx.org/pipermail/nginx/2011-January/024703.html 58 # http://nginx.org/pipermail/nginx/2011-January/024703.html
59 59
60 location /t1 { 60 location /t1 {
61 proxy_pass http://127.0.0.1:%%PORT_0%%/bad; 61 proxy_pass http://127.0.0.1:8080/bad;
62 proxy_cache cache; 62 proxy_cache cache;
63 proxy_cache_valid any 1h; 63 proxy_cache_valid any 1h;
64 64
65 image_filter resize 150 100; 65 image_filter resize 150 100;
66 error_page 415 = /empty; 66 error_page 415 = /empty;
76 76
77 # another segfault, introduced in 204b780a89de (1.3.0), 77 # another segfault, introduced in 204b780a89de (1.3.0),
78 # fixed in 07f028df3879 (1.3.1) 78 # fixed in 07f028df3879 (1.3.1)
79 79
80 location /t2 { 80 location /t2 {
81 proxy_pass http://127.0.0.1:%%PORT_0%%/big; 81 proxy_pass http://127.0.0.1:8080/big;
82 proxy_store on; 82 proxy_store on;
83 83
84 image_filter_buffer 10m; 84 image_filter_buffer 10m;
85 image_filter resize 150 100; 85 image_filter resize 150 100;
86 error_page 415 = /empty; 86 error_page 415 = /empty;
109 location /slow { 109 location /slow {
110 limit_req zone=limit burst=5; 110 limit_req zone=limit burst=5;
111 } 111 }
112 112
113 location /upstream { 113 location /upstream {
114 proxy_pass http://127.0.0.1:%%PORT_0%%/empty; 114 proxy_pass http://127.0.0.1:8080/empty;
115 } 115 }
116 116
117 location /time.log { 117 location /time.log {
118 # access to log 118 # access to log
119 } 119 }
120 } 120 }
121 121
122 server { 122 server {
123 listen 127.0.0.1:%%PORT_1%%; 123 listen 127.0.0.1:8081;
124 server_name localhost; 124 server_name localhost;
125 return 444; 125 return 444;
126 } 126 }
127 } 127 }
128 128