Author: mdounin
Date: 2012-02-05 12:46:20 +0000 (Sun, 05 Feb 2012)
New Revision: 4436

Log:
Merge of r4338:

Renamed some constants to improve readability, no functional changes.


Modified:
branches/stable-1.0/
branches/stable-1.0/src/http/ngx_http_header_filter_module.c


Property changes on: branches/stable-1.0
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:3960-3974,3977-3987,3991-3996,3998,4000-4018,4020,4023,4025-4027,4034-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4137,4143-4144,4147-4158,4177,4179,4182-4184,4186-4187,4189-4205,4207,4209-4210,4212,4217-4223,4227-4232,4235-4237,4265-4268,4270,4274-4276,4278-4280,4282-4284,4294-4295,4298,4300-4309,4313,4315,4320-4321,4326-4327,4335-4336,4342-4343,4377
+ /trunk:3960-3974,3977-3987,3991-3996,3998,4000-4018,4020,4023,4025-4027,4034-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4137,4143-4144,4147-4158,4177,4179,4182-4184,4186-4187,4189-4205,4207,4209-4210,4212,4217-4223,4227-4232,4235-4237,4265-4268,4270,4274-4276,4278-4280,4282-4284,4294-4295,4298,4300-4309,4313,4315,4320-4321,4326-4327,4335-4336,4338,4342-4343,4377

Modified: branches/stable-1.0/src/http/ngx_http_header_filter_module.c
===================================================================
--- branches/stable-1.0/src/http/ngx_http_header_filter_module.c 2012-02-05 12:42:36 UTC (rev 4435)
+++ branches/stable-1.0/src/http/ngx_http_header_filter_module.c 2012-02-05 12:46:20 UTC (rev 4436)
@@ -61,8 +61,8 @@

/* ngx_null_string, */ /* "207 Multi-Status" */

-#define NGX_HTTP_LAST_LEVEL_200 207
-#define NGX_HTTP_LEVEL_200 (NGX_HTTP_LAST_LEVEL_200 - 200)
+#define NGX_HTTP_LAST_2XX 207
+#define NGX_HTTP_OFF_3XX (NGX_HTTP_LAST_2XX - 200)

/* ngx_null_string, */ /* "300 Multiple Choices" */

@@ -75,8 +75,8 @@
/* ngx_null_string, */ /* "306 unused" */
/* ngx_null_string, */ /* "307 Temporary Redirect" */

-#define NGX_HTTP_LAST_LEVEL_300 305
-#define NGX_HTTP_LEVEL_300 (NGX_HTTP_LAST_LEVEL_300 - 301)
+#define NGX_HTTP_LAST_3XX 305
+#define NGX_HTTP_OFF_4XX (NGX_HTTP_LAST_3XX - 301 + NGX_HTTP_OFF_3XX)

ngx_string("400 Bad Request"),
ngx_string("401 Unauthorized"),
@@ -108,8 +108,8 @@
/* ngx_null_string, */ /* "423 Locked" */
/* ngx_null_string, */ /* "424 Failed Dependency" */

-#define NGX_HTTP_LAST_LEVEL_400 417
-#define NGX_HTTP_LEVEL_400 (NGX_HTTP_LAST_LEVEL_400 - 400)
+#define NGX_HTTP_LAST_4XX 417
+#define NGX_HTTP_OFF_5XX (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX)

ngx_string("500 Internal Server Error"),
ngx_string("501 Method Not Implemented"),
@@ -124,7 +124,7 @@
/* ngx_null_string, */ /* "509 unused" */
/* ngx_null_string, */ /* "510 Not Extended" */

-#define NGX_HTTP_LAST_LEVEL_500 508
+#define NGX_HTTP_LAST_5XX 508

};

@@ -216,7 +216,7 @@
status = r->headers_out.status;

if (status >= NGX_HTTP_OK
- && status < NGX_HTTP_LAST_LEVEL_200)
+ && status < NGX_HTTP_LAST_2XX)
{
/* 2XX */

@@ -234,7 +234,7 @@
len += ngx_http_status_lines[status].len;

} else if (status >= NGX_HTTP_MOVED_PERMANENTLY
- && status < NGX_HTTP_LAST_LEVEL_300)
+ && status < NGX_HTTP_LAST_3XX)
{
/* 3XX */

@@ -242,29 +242,26 @@
r->header_only = 1;
}

- status = status - NGX_HTTP_MOVED_PERMANENTLY + NGX_HTTP_LEVEL_200;
+ status = status - NGX_HTTP_MOVED_PERMANENTLY + NGX_HTTP_OFF_3XX;
status_line = &ngx_http_status_lines[status];
len += ngx_http_status_lines[status].len;

} else if (status >= NGX_HTTP_BAD_REQUEST
- && status < NGX_HTTP_LAST_LEVEL_400)
+ && status < NGX_HTTP_LAST_4XX)
{
/* 4XX */
status = status - NGX_HTTP_BAD_REQUEST
- + NGX_HTTP_LEVEL_200
- + NGX_HTTP_LEVEL_300;
+ + NGX_HTTP_OFF_4XX;

status_line = &ngx_http_status_lines[status];
len += ngx_http_status_lines[status].len;

} else if (status >= NGX_HTTP_INTERNAL_SERVER_ERROR
- && status < NGX_HTTP_LAST_LEVEL_500)
+ && status < NGX_HTTP_LAST_5XX)
{
/* 5XX */
status = status - NGX_HTTP_INTERNAL_SERVER_ERROR
- + NGX_HTTP_LEVEL_200
- + NGX_HTTP_LEVEL_300
- + NGX_HTTP_LEVEL_400;
+ + NGX_HTTP_OFF_5XX;

status_line = &ngx_http_status_lines[status];
len += ngx_http_status_lines[status].len;

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel