Changeset 5073:52eb762c68a9 in nginx

Timestamp:

02/18/13 15:08:46 (11 years ago)

Author:

Maxim Dounin <mdounin@…>

Branch:

default

Phase:

public

Convert:

svn:c3fe7df1-7212-e011-8a91-001109144009/trunk@5074

Message:

Proxy: fixed do_write handling in previous commit.

As rightfully complained by MSVC, do_write variable was used uninitialized.
Correct fix is to set it's initial value based on event happened.

File:

• src/http/ngx_http_upstream.c (modified) (8 diffs)

src/http/ngx_http_upstream.c

@@ -56 +56 @@
     ngx_http_upstream_t *u);
 static void ngx_http_upstream_process_upgraded(ngx_http_request_t *r,
-    ngx_uint_t from_upstream);
+    ngx_uint_t from_upstream, ngx_uint_t do_write);
 static void
     ngx_http_upstream_process_non_buffered_downstream(ngx_http_request_t *r);
@@ -2433 +2433 @@
         || u->buffer.pos != u->buffer.last)
     {
-        ngx_http_upstream_process_upgraded(r, 1);
+        ngx_http_upstream_process_upgraded(r, 1, 1);
     }
 
@@ -2439 +2439 @@
         || r->header_in->pos != r->header_in->last)
     {
-        ngx_http_upstream_process_upgraded(r, 0);
+        ngx_http_upstream_process_upgraded(r, 0, 1);
     }
 }
@@ -2447 +2447 @@
 ngx_http_upstream_upgraded_read_downstream(ngx_http_request_t *r)
 {
-    ngx_http_upstream_process_upgraded(r, 0);
+    ngx_http_upstream_process_upgraded(r, 0, 0);
 }
 
@@ -2454 +2454 @@
 ngx_http_upstream_upgraded_write_downstream(ngx_http_request_t *r)
 {
-    ngx_http_upstream_process_upgraded(r, 1);
+    ngx_http_upstream_process_upgraded(r, 1, 1);
 }
 
@@ -2462 +2462 @@
     ngx_http_upstream_t *u)
 {
-    ngx_http_upstream_process_upgraded(r, 1);
+    ngx_http_upstream_process_upgraded(r, 1, 0);
 }
 
@@ -2470 +2470 @@
     ngx_http_upstream_t *u)
 {
-    ngx_http_upstream_process_upgraded(r, 0);
+    ngx_http_upstream_process_upgraded(r, 0, 1);
 }
 
@@ -2476 +2476 @@
 static void
 ngx_http_upstream_process_upgraded(ngx_http_request_t *r,
-    ngx_uint_t from_upstream)
+    ngx_uint_t from_upstream, ngx_uint_t do_write)
 {
     size_t                     size;
     ssize_t                    n;
     ngx_buf_t                 *b;
-    ngx_uint_t                 do_write;
     ngx_connection_t          *c, *downstream, *upstream, *dst, *src;
     ngx_http_upstream_t       *u;