# HG changeset patch
# User Sergey Kandaurov <pluknet@nginx.com>
# Date 1428513400 -10800
# Node ID dbf8fb0f3d30a3946a6b47db95239afd18659514
# Parent  e82bbe71f50c6e03f85ef0978521f9dbd1261206
Tests: fixed unbuffered request body tests.

In particular, made sure that the whole request body is read on backend.

diff --git a/fastcgi_request_buffering.t b/fastcgi_request_buffering.t
--- a/fastcgi_request_buffering.t
+++ b/fastcgi_request_buffering.t
@@ -49,15 +49,14 @@ http {
         client_header_buffer_size 1k;
         fastcgi_request_buffering off;
         fastcgi_param REQUEST_URI $request_uri;
+        fastcgi_param CONTENT_LENGTH $content_length;
 
         location / {
             client_body_buffer_size 2k;
-            add_header X-Body "$request_body";
             fastcgi_pass 127.0.0.1:8081;
         }
         location /single {
             client_body_in_single_buffer on;
-            add_header X-Body "$request_body";
             fastcgi_pass 127.0.0.1:8081;
         }
         location /preread {
@@ -83,7 +82,7 @@ EOF
 
 ###############################################################################
 
-unlike(http_get('/'), qr/X-Body:/ms, 'no body');
+like(http_get('/'), qr/X-Body: \x0d\x0a?/ms, 'no body');
 
 like(http_get_body('/', '0123456789'),
 	qr/X-Body: 0123456789\x0d?$/ms, 'body');
@@ -337,12 +336,11 @@ sub fastcgi_daemon {
 		$socket);
 
 	my $count;
+	my $body;
+
 	while( $request->Accept() >= 0 ) {
 		$count++;
-
-		if ($ENV{REQUEST_URI} eq '/stderr') {
-			warn "sample stderr text" x 512;
-		}
+		read(STDIN, $body, $ENV{'CONTENT_LENGTH'});
 
 		if ($ENV{REQUEST_URI} eq '/error_page') {
 			print "Status: 404 Not Found" . CRLF . CRLF;
@@ -352,6 +350,7 @@ sub fastcgi_daemon {
 		print <<EOF;
 Location: http://127.0.0.1:8080/redirect
 Content-Type: text/html
+X-Body: $body
 
 SEE-THIS
 $count
diff --git a/fastcgi_request_buffering_chunked.t b/fastcgi_request_buffering_chunked.t
--- a/fastcgi_request_buffering_chunked.t
+++ b/fastcgi_request_buffering_chunked.t
@@ -53,12 +53,10 @@ http {
 
         location / {
             client_body_buffer_size 2k;
-            add_header X-Body "$request_body";
             fastcgi_pass 127.0.0.1:8081;
         }
         location /single {
             client_body_in_single_buffer on;
-            add_header X-Body "$request_body";
             fastcgi_pass 127.0.0.1:8081;
         }
         location /preread {
@@ -84,7 +82,7 @@ EOF
 
 ###############################################################################
 
-unlike(http_get('/'), qr/X-Body:/ms, 'no body');
+like(http_get('/'), qr/X-Body: \x0d\x0a?/ms, 'no body');
 
 like(http_get_body('/', '0123456789'),
 	qr/X-Body: 0123456789\x0d?$/ms, 'body');
@@ -155,14 +153,18 @@ sub http_get_body {
 		my $body = $_;
 		"GET $uri HTTP/1.1" . CRLF
 		. "Host: localhost" . CRLF
-		. "Content-Length: " . (length $body) . CRLF . CRLF
-		. $body
+		. "Transfer-Encoding: chunked" . CRLF . CRLF
+		. sprintf("%x", length $body) . CRLF
+		. $body . CRLF
+		. "0" . CRLF . CRLF
 	} @_),
 		"GET $uri HTTP/1.1" . CRLF
 		. "Host: localhost" . CRLF
 		. "Connection: close" . CRLF
-		. "Content-Length: " . (length $last) . CRLF . CRLF
-		. $last
+		. "Transfer-Encoding: chunked" . CRLF . CRLF
+		. sprintf("%x", length $last) . CRLF
+		. $last . CRLF
+		. "0" . CRLF . CRLF
 	);
 }
 
@@ -378,12 +380,16 @@ sub fastcgi_daemon {
 		$socket);
 
 	my $count;
+	my ($body, $buf);
+
 	while( $request->Accept() >= 0 ) {
 		$count++;
+		$body = '';
 
-		if ($ENV{REQUEST_URI} eq '/stderr') {
-			warn "sample stderr text" x 512;
-		}
+		do {
+			read(STDIN, $buf, 1024);
+			$body .= $buf;
+		} while (length $buf);
 
 		if ($ENV{REQUEST_URI} eq '/error_page') {
 			print "Status: 404 Not Found" . CRLF . CRLF;
@@ -393,6 +399,7 @@ sub fastcgi_daemon {
 		print <<EOF;
 Location: http://127.0.0.1:8080/redirect
 Content-Type: text/html
+X-Body: $body
 
 SEE-THIS
 $count
diff --git a/proxy_request_buffering.t b/proxy_request_buffering.t
--- a/proxy_request_buffering.t
+++ b/proxy_request_buffering.t
@@ -80,7 +80,7 @@ http {
         server_name  localhost;
 
         location / {
-            return 204;
+            proxy_pass http://127.0.0.1:8080/discard;
         }
         location /404 { }
     }
diff --git a/proxy_request_buffering_chunked.t b/proxy_request_buffering_chunked.t
--- a/proxy_request_buffering_chunked.t
+++ b/proxy_request_buffering_chunked.t
@@ -81,7 +81,7 @@ http {
         server_name  localhost;
 
         location / {
-            return 204;
+            proxy_pass http://127.0.0.1:8080/discard;
         }
         location /404 { }
     }
@@ -193,14 +193,18 @@ sub http_get_body {
 		my $body = $_;
 		"GET $uri HTTP/1.1" . CRLF
 		. "Host: localhost" . CRLF
-		. "Content-Length: " . (length $body) . CRLF . CRLF
-		. $body
+		. "Transfer-Encoding: chunked" . CRLF . CRLF
+		. sprintf("%x", length $body) . CRLF
+		. $body . CRLF
+		. "0" . CRLF . CRLF
 	} @_),
 		"GET $uri HTTP/1.1" . CRLF
 		. "Host: localhost" . CRLF
 		. "Connection: close" . CRLF
-		. "Content-Length: " . (length $last) . CRLF . CRLF
-		. $last
+		. "Transfer-Encoding: chunked" . CRLF . CRLF
+		. sprintf("%x", length $last) . CRLF
+		. $last . CRLF
+		. "0" . CRLF . CRLF
 	);
 }
 
diff --git a/proxy_request_buffering_ssl.t b/proxy_request_buffering_ssl.t
--- a/proxy_request_buffering_ssl.t
+++ b/proxy_request_buffering_ssl.t
@@ -78,16 +78,16 @@ http {
 
         ssl_certificate_key localhost.key;
         ssl_certificate localhost.crt;
-        proxy_request_buffering off;
 
         location /preread {
             client_body_buffer_size 2k;
             add_header X-Body "$request_body";
             proxy_pass http://127.0.0.1:8082/;
+            proxy_request_buffering off;
         }
 
         location / {
-            return 204;
+            proxy_pass http://127.0.0.1:8080/discard;
         }
         location /404 { }
     }