Mercurial > hg > nginx

comparison src/http/ngx_http_special_response.c @ 4490:0cc1b430a0e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Renamed constants and fixed off-by-one error in "msie_padding on" handling.
author Ruslan Ermilov <ru@nginx.com>
date Wed, 22 Feb 2012 16:23:29 +0000
parents d620f497c50f
children d11f86a16e3b
comparison
equal deleted inserted replaced
4489:9806bf07d119 4490:0cc1b430a0e6
292 292
293 static ngx_str_t ngx_http_error_pages[] = { 293 static ngx_str_t ngx_http_error_pages[] = {
294 294
295 ngx_null_string, /* 201, 204 */ 295 ngx_null_string, /* 201, 204 */
296 296
297 #define NGX_HTTP_LAST_LEVEL_200 202 297 #define NGX_HTTP_LAST_2XX 202
298 #define NGX_HTTP_LEVEL_200 (NGX_HTTP_LAST_LEVEL_200 - 201) 298 #define NGX_HTTP_OFF_3XX (NGX_HTTP_LAST_2XX - 201)
299 299
300 /* ngx_null_string, */ /* 300 */ 300 /* ngx_null_string, */ /* 300 */
301 ngx_string(ngx_http_error_301_page), 301 ngx_string(ngx_http_error_301_page),
302 ngx_string(ngx_http_error_302_page), 302 ngx_string(ngx_http_error_302_page),
303 ngx_string(ngx_http_error_303_page), 303 ngx_string(ngx_http_error_303_page),
304 304
305 #define NGX_HTTP_LAST_LEVEL_300 304 305 #define NGX_HTTP_LAST_3XX 304
306 #define NGX_HTTP_LEVEL_300 (NGX_HTTP_LAST_LEVEL_300 - 301) 306 #define NGX_HTTP_OFF_4XX (NGX_HTTP_LAST_3XX - 301 + NGX_HTTP_OFF_3XX)
307 307
308 ngx_string(ngx_http_error_400_page), 308 ngx_string(ngx_http_error_400_page),
309 ngx_string(ngx_http_error_401_page), 309 ngx_string(ngx_http_error_401_page),
310 ngx_string(ngx_http_error_402_page), 310 ngx_string(ngx_http_error_402_page),
311 ngx_string(ngx_http_error_403_page), 311 ngx_string(ngx_http_error_403_page),
321 ngx_string(ngx_http_error_413_page), 321 ngx_string(ngx_http_error_413_page),
322 ngx_string(ngx_http_error_414_page), 322 ngx_string(ngx_http_error_414_page),
323 ngx_string(ngx_http_error_415_page), 323 ngx_string(ngx_http_error_415_page),
324 ngx_string(ngx_http_error_416_page), 324 ngx_string(ngx_http_error_416_page),
325 325
326 #define NGX_HTTP_LAST_LEVEL_400 417 326 #define NGX_HTTP_LAST_4XX 417
327 #define NGX_HTTP_LEVEL_400 (NGX_HTTP_LAST_LEVEL_400 - 400) 327 #define NGX_HTTP_OFF_5XX (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX)
328 328
329 ngx_string(ngx_http_error_494_page), /* 494, request header too large */ 329 ngx_string(ngx_http_error_494_page), /* 494, request header too large */
330 ngx_string(ngx_http_error_495_page), /* 495, https certificate error */ 330 ngx_string(ngx_http_error_495_page), /* 495, https certificate error */
331 ngx_string(ngx_http_error_496_page), /* 496, https no certificate */ 331 ngx_string(ngx_http_error_496_page), /* 496, https no certificate */
332 ngx_string(ngx_http_error_497_page), /* 497, http to https */ 332 ngx_string(ngx_http_error_497_page), /* 497, http to https */
340 ngx_string(ngx_http_error_504_page), 340 ngx_string(ngx_http_error_504_page),
341 ngx_null_string, /* 505 */ 341 ngx_null_string, /* 505 */
342 ngx_null_string, /* 506 */ 342 ngx_null_string, /* 506 */
343 ngx_string(ngx_http_error_507_page) 343 ngx_string(ngx_http_error_507_page)
344 344
345 #define NGX_HTTP_LAST_LEVEL_500 508 345 #define NGX_HTTP_LAST_5XX 508
346 346
347 }; 347 };
348 348
349 349
350 static ngx_str_t ngx_http_get_name = { 3, (u_char *) "GET " }; 350 static ngx_str_t ngx_http_get_name = { 3, (u_char *) "GET " };
426 } else if (error == NGX_HTTP_NO_CONTENT) { 426 } else if (error == NGX_HTTP_NO_CONTENT) {
427 /* 204 */ 427 /* 204 */
428 err = 0; 428 err = 0;
429 429
430 } else if (error >= NGX_HTTP_MOVED_PERMANENTLY 430 } else if (error >= NGX_HTTP_MOVED_PERMANENTLY
431 && error < NGX_HTTP_LAST_LEVEL_300) 431 && error < NGX_HTTP_LAST_3XX)
432 { 432 {
433 /* 3XX */ 433 /* 3XX */
434 err = error - NGX_HTTP_MOVED_PERMANENTLY + NGX_HTTP_LEVEL_200; 434 err = error - NGX_HTTP_MOVED_PERMANENTLY + NGX_HTTP_OFF_3XX;
435 435
436 } else if (error >= NGX_HTTP_BAD_REQUEST 436 } else if (error >= NGX_HTTP_BAD_REQUEST
437 && error < NGX_HTTP_LAST_LEVEL_400) 437 && error < NGX_HTTP_LAST_4XX)
438 { 438 {
439 /* 4XX */ 439 /* 4XX */
440 err = error - NGX_HTTP_BAD_REQUEST + NGX_HTTP_LEVEL_200 440 err = error - NGX_HTTP_BAD_REQUEST + NGX_HTTP_OFF_4XX;
441 + NGX_HTTP_LEVEL_300;
442 441
443 } else if (error >= NGX_HTTP_NGINX_CODES 442 } else if (error >= NGX_HTTP_NGINX_CODES
444 && error < NGX_HTTP_LAST_LEVEL_500) 443 && error < NGX_HTTP_LAST_5XX)
445 { 444 {
446 /* 49X, 5XX */ 445 /* 49X, 5XX */
447 err = error - NGX_HTTP_NGINX_CODES + NGX_HTTP_LEVEL_200 446 err = error - NGX_HTTP_NGINX_CODES + NGX_HTTP_OFF_5XX;
448 + NGX_HTTP_LEVEL_300
449 + NGX_HTTP_LEVEL_400;
450 switch (error) { 447 switch (error) {
451 case NGX_HTTP_TO_HTTPS: 448 case NGX_HTTP_TO_HTTPS:
452 case NGX_HTTPS_CERT_ERROR: 449 case NGX_HTTPS_CERT_ERROR:
453 case NGX_HTTPS_NO_CERT: 450 case NGX_HTTPS_NO_CERT:
454 case NGX_HTTP_REQUEST_HEADER_TOO_LARGE: 451 case NGX_HTTP_REQUEST_HEADER_TOO_LARGE:
593 return ngx_http_send_refresh(r); 590 return ngx_http_send_refresh(r);
594 } 591 }
595 592
596 return ngx_http_send_special_response(r, clcf, r->err_status 593 return ngx_http_send_special_response(r, clcf, r->err_status
597 - NGX_HTTP_MOVED_PERMANENTLY 594 - NGX_HTTP_MOVED_PERMANENTLY
598 + NGX_HTTP_LEVEL_200); 595 + NGX_HTTP_OFF_3XX);
599 } 596 }
600 597
601 598
602 static ngx_int_t 599 static ngx_int_t
603 ngx_http_send_special_response(ngx_http_request_t *r, 600 ngx_http_send_special_response(ngx_http_request_t *r,
624 if (ngx_http_error_pages[err].len) { 621 if (ngx_http_error_pages[err].len) {
625 r->headers_out.content_length_n = ngx_http_error_pages[err].len + len; 622 r->headers_out.content_length_n = ngx_http_error_pages[err].len + len;
626 if (clcf->msie_padding 623 if (clcf->msie_padding
627 && (r->headers_in.msie || r->headers_in.chrome) 624 && (r->headers_in.msie || r->headers_in.chrome)
628 && r->http_version >= NGX_HTTP_VERSION_10 625 && r->http_version >= NGX_HTTP_VERSION_10
629 && err >= NGX_HTTP_LEVEL_300) 626 && err >= NGX_HTTP_OFF_4XX)
630 { 627 {
631 r->headers_out.content_length_n += 628 r->headers_out.content_length_n +=
632 sizeof(ngx_http_msie_padding) - 1; 629 sizeof(ngx_http_msie_padding) - 1;
633 msie_padding = 1; 630 msie_padding = 1;
634 } 631 }