← Back to branch summary

~ubuntu-branches/debian/squeeze/nginx/squeeze

« back to all changes in this revision

Viewing changes to src/http/ngx_http_core_module.c

  • Committer: Bazaar Package Importer
  • Author(s): Kartik Mistry
  • Date: 2010-06-16 01:26:51 UTC
  • mfrom: (1.1.16 upstream)
  • Revision ID: james.westby@ubuntu.com-20100616012651-0kldmspg3i91mynk
Tags: 0.7.67-1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/http/ngx_http_core_module.c
560
560
      offsetof(ngx_http_core_loc_conf_t, if_modified_since),
561
561
      &ngx_http_core_if_modified_since },
562
562
 
 
563
    { ngx_string("chunked_transfer_encoding"),
 
564
      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
 
565
      ngx_conf_set_flag_slot,
 
566
      NGX_HTTP_LOC_CONF_OFFSET,
 
567
      offsetof(ngx_http_core_loc_conf_t, chunked_transfer_encoding),
 
568
      NULL },
 
569
 
563
570
    { ngx_string("error_page"),
564
571
      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
565
572
                        |NGX_CONF_2MORE,
744
751
            break;
745
752
        }
746
753
 
747
 
        if (r->keepalive && r->headers_in.msie && r->method == NGX_HTTP_POST) {
748
 
 
749
 
            /*
750
 
             * MSIE may wait for some time if an response for
751
 
             * a POST request was sent over a keepalive connection
752
 
             */
753
 
 
754
 
            r->keepalive = 0;
 
754
        if (r->keepalive) {
 
755
 
 
756
            if (r->headers_in.msie6) {
 
757
                if (r->method == NGX_HTTP_POST) {
 
758
                    /*
 
759
                     * MSIE may wait for some time if an response for
 
760
                     * a POST request was sent over a keepalive connection
 
761
                     */
 
762
                    r->keepalive = 0;
 
763
                }
 
764
 
 
765
            } else if (r->headers_in.safari) {
 
766
                /*
 
767
                 * Safari may send a POST request to a closed keepalive
 
768
                 * connection and stalls for some time
 
769
                 */
 
770
                r->keepalive = 0;
 
771
            }
755
772
        }
756
773
 
757
774
        if (r->headers_in.content_length_n > 0) {
1288
1305
 
1289
1306
    /* no content handler was found */
1290
1307
 
1291
 
    if (r->uri.data[r->uri.len - 1] == '/' && !r->zero_in_uri) {
 
1308
    if (r->uri.data[r->uri.len - 1] == '/') {
1292
1309
 
1293
1310
        if (ngx_http_map_uri_to_path(r, &path, &root, 0) != NULL) {
1294
1311
            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
2076
2093
    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
2077
2094
                   "http subrequest \"%V?%V\"", uri, &sr->args);
2078
2095
 
2079
 
    sr->zero_in_uri = (flags & NGX_HTTP_ZERO_IN_URI) != 0;
2080
2096
    sr->subrequest_in_memory = (flags & NGX_HTTP_SUBREQUEST_IN_MEMORY) != 0;
2081
2097
    sr->waited = (flags & NGX_HTTP_SUBREQUEST_WAITED) != 0;
2082
2098
 
2944
2960
    lcf->log_subrequest = NGX_CONF_UNSET;
2945
2961
    lcf->recursive_error_pages = NGX_CONF_UNSET;
2946
2962
    lcf->server_tokens = NGX_CONF_UNSET;
 
2963
    lcf->chunked_transfer_encoding = NGX_CONF_UNSET;
2947
2964
    lcf->types_hash_max_size = NGX_CONF_UNSET_UINT;
2948
2965
    lcf->types_hash_bucket_size = NGX_CONF_UNSET_UINT;
2949
2966
 
3181
3198
    ngx_conf_merge_value(conf->recursive_error_pages,
3182
3199
                              prev->recursive_error_pages, 0);
3183
3200
    ngx_conf_merge_value(conf->server_tokens, prev->server_tokens, 1);
 
3201
    ngx_conf_merge_value(conf->chunked_transfer_encoding,
 
3202
                              prev->chunked_transfer_encoding, 1);
3184
3203
 
3185
3204
    ngx_conf_merge_ptr_value(conf->open_file_cache,
3186
3205
                              prev->open_file_cache, NULL);