commit 12b4b00784bbc3cd934e2f2bbee79679684629e3
author Igor Sysoev <igor@sysoev.ru> Fri Oct 24 06:53:41 2003 +0000
committer Igor Sysoev <igor@sysoev.ru> Fri Oct 24 06:53:41 2003 +0000
tree 602dfdcdc4fe5b21c17366eacfae63efcb03770e
parent 8556e6da41e80772cb9710e4309d9ad44a7b360e

nginx-0.0.1-2003-10-24-10:53:41 import

src/http/ngx_http_core_module.c

diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 8c96d0e..ad557e4 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -165,6 +165,13 @@
      offsetof(ngx_http_core_loc_conf_t, lingering_timeout),
      NULL},
 
+    {ngx_string("msie_padding"),
+     NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+     ngx_conf_set_flag_slot,
+     NGX_HTTP_LOC_CONF_OFFSET,
+     offsetof(ngx_http_core_loc_conf_t, msie_padding),
+     NULL},
+
     {ngx_string("error_log"),
      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
      ngx_set_error_log,
@@ -843,6 +850,8 @@
     lcf->lingering_time = NGX_CONF_UNSET;
     lcf->lingering_timeout = NGX_CONF_UNSET;
 
+    lcf->msie_padding = NGX_CONF_UNSET;
+
     return lcf;
 }
 
@@ -916,6 +925,8 @@
     ngx_conf_merge_msec_value(conf->lingering_timeout,
                               prev->lingering_timeout, 5000);
 
+    ngx_conf_merge_value(conf->msie_padding, prev->msie_padding, 1);
+
     return NGX_CONF_OK;
 }