aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Fandrich <dan@coneharvesters.com>2008-10-07 23:15:02 +0000
committerDan Fandrich <dan@coneharvesters.com>2008-10-07 23:15:02 +0000
commitb9ce8714631318f3252354534ac49fd4aa72dcb0 (patch)
tree13071a6e2552b2438ca97e2bb1bd9a550073c590
parent0bd78e1cd86718a7a85a1df0e22bf634a99f811b (diff)
Changed the handling of read/write errors in Curl_perform() to allow a
a fresh connection to be made in such cases and the request retransmitted. This should fix test case 160. Added test case 1079 in an attempt to test a similar connection dropping scenario, but as a race condition, it's hard to test reliably.
-rw-r--r--CHANGES7
-rw-r--r--lib/transfer.c11
-rw-r--r--tests/data/DISABLED1
-rw-r--r--tests/data/Makefile.am2
-rw-r--r--tests/data/test107975
5 files changed, 88 insertions, 8 deletions
diff --git a/CHANGES b/CHANGES
index 3b15134f1..2aeba086c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,13 @@
Changelog
+Daniel Fandrich (7 Oct 2008)
+- Changed the handling of read/write errors in Curl_perform() to allow a
+ a fresh connection to be made in such cases and the request retransmitted.
+ This should fix test case 160. Added test case 1079 in an attempt to
+ test a similar connection dropping scenario, but as a race condition, it's
+ hard to test reliably.
+
Daniel Stenberg (7 Oct 2008)
- Fixed CURLINFO_PRIMARY_IP: When libcurl created a connection to host A then
the app re-used the handle to do a connection to host B and then again
diff --git a/lib/transfer.c b/lib/transfer.c
index 8d2d0db82..2f4ce692d 100644
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -1848,11 +1848,9 @@ Transfer(struct connectdata *conn)
/* The EINTR is not serious, and it seems you might get this more
often when using the lib in a multi-threaded environment! */
if(SOCKERRNO == EINTR)
- ;
- else
+ continue;
#endif
- done = TRUE; /* no more read or write */
- continue;
+ return CURLE_RECV_ERROR; /* indicate a network problem */
case 0: /* timeout */
default: /* readable descriptors */
@@ -2465,15 +2463,16 @@ CURLcode Curl_perform(struct SessionHandle *data)
if(res == CURLE_OK) {
res = Transfer(conn); /* now fetch that URL please */
- if(res == CURLE_OK) {
+ if((res == CURLE_OK) || (res == CURLE_RECV_ERROR)) {
bool retry = Curl_retry_request(conn, &newurl);
if(retry) {
+ res = CURLE_OK;
follow = FOLLOW_RETRY;
if (!newurl)
res = CURLE_OUT_OF_MEMORY;
}
- else {
+ else if (res == CURLE_OK) {
/*
* We must duplicate the new URL here as the connection data may
* be free()ed in the Curl_done() function. We prefer the newurl
diff --git a/tests/data/DISABLED b/tests/data/DISABLED
index 9fe82a528..2055e9f16 100644
--- a/tests/data/DISABLED
+++ b/tests/data/DISABLED
@@ -3,4 +3,3 @@
# test cases are run by runtests.pl. Just add the plain test case numbers, one
# per line.
# Lines starting with '#' letters are treated as comments.
-160
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 3af445f60..dd3c537fb 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -57,7 +57,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46 \
test1048 test1049 test1050 test1051 test1052 test1053 test1054 test1055 \
test1056 test1057 test1058 test1059 test1060 test1061 test1062 test1063 \
test1064 test1065 test1066 test1067 test1068 test1069 test1070 test1071 \
- test1072 test1073 test1074 test1075 test1076 test1077 test1078
+ test1072 test1073 test1074 test1075 test1076 test1077 test1078 test1079
filecheck:
@mkdir test-place; \
diff --git a/tests/data/test1079 b/tests/data/test1079
new file mode 100644
index 000000000..c188e792e
--- /dev/null
+++ b/tests/data/test1079
@@ -0,0 +1,75 @@
+<testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+HTTP Digest auth
+</keywords>
+</info>
+
+# Server-side
+<reply>
+<data>
+HTTP/1.1 401 Authorization Required swsclose
+Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
+Content-Type: text/plain; charset=iso-8859-1
+Content-Length: 26
+
+This is not the real page
+</data>
+
+# This is supposed to be returned when the server gets a
+# Authorization: Digest line passed-in from the client
+# Send nothing to force an error code 52 reply
+<data1000>
+</data1000>
+
+<datacheck>
+HTTP/1.1 401 Authorization Required swsclose
+Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
+Content-Type: text/plain; charset=iso-8859-1
+Content-Length: 26
+
+</datacheck>
+
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+<features>
+crypto
+</features>
+ <name>
+HTTP retry after closed connection and empty response
+ </name>
+ <command>
+http://%HOSTIP:%HTTPPORT/1079 -u testuser:testpass --digest
+</command>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+52
+</errorcode>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /1079 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /1079 HTTP/1.1
+Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/1079", response="e340c7cdca0950462070f46ee139e9f7"
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+</protocol>
+</verify>
+</testcase>