Changeset e7b311 for server/src/http/ngx_http_core_module.c

Timestamp:

02/03/09 19:41:37 (3 years ago)

Author:

George Potapov <nephrite@…>

Branches:

master-v0.7, nginx-v0.7, nginx-v0.8, upstream_count_limit

Children:

2ac4f5

Parents:

2240a4

git-author:

George Potapov <nephrite@…> (02/03/09 19:41:37)

git-committer:

George Potapov <nephrite@…> (02/03/09 19:41:37)

Message:

vendor drop nginx 0.7.31

File:

• server/src/http/ngx_http_core_module.c (modified) (6 diffs)

server/src/http/ngx_http_core_module.c

@@ -24 +24 @@
 static ngx_int_t ngx_http_core_find_static_location(ngx_http_request_t *r,
     ngx_http_location_tree_node_t *node);
-static ngx_int_t ngx_http_core_send_continue(ngx_http_request_t *r);
 
 static ngx_int_t ngx_http_core_preconfiguration(ngx_conf_t *cf);
@@ -819 +818 @@
     u_char                    *p;
     size_t                     len;
-    ngx_int_t                  rc, expect;
+    ngx_int_t                  rc;
     ngx_http_core_loc_conf_t  *clcf;
 
@@ -861 +860 @@
         ngx_http_finalize_request(r, NGX_HTTP_REQUEST_ENTITY_TOO_LARGE);
         return NGX_OK;
-    }
-
-    if (r->headers_in.expect && r->http_version > NGX_HTTP_VERSION_10) {
-        expect = ngx_http_core_send_continue(r);
-
-        if (expect != NGX_OK) {
-            ngx_http_finalize_request(r, expect);
-            return NGX_OK;
-        }
     }
 
@@ -1183 +1173 @@
         }
 
+        if (!of.is_file) {
+            continue;
+        }
+
         path.len -= root;
         path.data += root;
@@ -1491 +1485 @@
 
 
-static ngx_int_t
-ngx_http_core_send_continue(ngx_http_request_t *r)
-{
-    ngx_int_t   n;
-    ngx_str_t  *expect;
-
-    if (r->expect_tested) {
-        return NGX_OK;
-    }
-
-    r->expect_tested = 1;
-
-    expect = &r->headers_in.expect->value;
-
-    if (expect->len != sizeof("100-continue") - 1
-        || ngx_strncasecmp(expect->data, (u_char *) "100-continue",
-                           sizeof("100-continue") - 1)
-           != 0)
-    {
-        return NGX_OK;
-    }
-
-    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                   "send 100 Continue");
-
-    n = r->connection->send(r->connection,
-                            (u_char *) "HTTP/1.1 100 Continue" CRLF CRLF,
-                            sizeof("HTTP/1.1 100 Continue" CRLF CRLF) - 1);
-
-    if (n == sizeof("HTTP/1.1 100 Continue" CRLF CRLF) - 1) {
-        return NGX_OK;
-    }
-
-    /* we assume that such small packet should be send successfully */
-
-    return NGX_HTTP_INTERNAL_SERVER_ERROR;
-}
-
-
 void *
 ngx_http_test_content_type(ngx_http_request_t *r, ngx_hash_t *types_hash)
@@ -2126 +2081 @@
 
     sr->discard_body = r->discard_body;
+    sr->expect_tested = 1;
     sr->main_filter_need_in_memory = r->main_filter_need_in_memory;