diff options
| -rw-r--r-- | lib/pingpong.c | 2 | ||||
| -rw-r--r-- | lib/pop3.c | 2 | ||||
| -rw-r--r-- | lib/smtp.c | 4 | ||||
| -rw-r--r-- | tests/data/test852 | 2 | ||||
| -rw-r--r-- | tests/data/test855 | 2 | ||||
| -rw-r--r-- | tests/data/test926 | 4 | ||||
| -rw-r--r-- | tests/data/test957 | 4 | ||||
| -rw-r--r-- | tests/data/test958 | 4 | ||||
| -rw-r--r-- | tests/data/test961 | 4 |
9 files changed, 14 insertions, 14 deletions
diff --git a/lib/pingpong.c b/lib/pingpong.c index 1453bf299..e08c1d866 100644 --- a/lib/pingpong.c +++ b/lib/pingpong.c @@ -293,7 +293,7 @@ CURLcode Curl_pp_readresp(struct Curl_easy *data, */ if((ptr + pp->cache_size) > (buf + data->set.buffer_size + 1)) { failf(data, "cached response data too big to handle"); - return CURLE_RECV_ERROR; + return CURLE_WEIRD_SERVER_REPLY; } memcpy(ptr, pp->cache, pp->cache_size); gotbytes = (ssize_t)pp->cache_size; diff --git a/lib/pop3.c b/lib/pop3.c index 065bdbaf5..3e0d5a4a0 100644 --- a/lib/pop3.c +++ b/lib/pop3.c @@ -924,7 +924,7 @@ static CURLcode pop3_state_command_resp(struct Curl_easy *data, if(pop3code != '+') { state(data, POP3_STOP); - return CURLE_RECV_ERROR; + return CURLE_WEIRD_SERVER_REPLY; } /* This 'OK' line ends with a CR LF pair which is the two first bytes of the diff --git a/lib/smtp.c b/lib/smtp.c index 28aa44a49..3e04154ba 100644 --- a/lib/smtp.c +++ b/lib/smtp.c @@ -1037,7 +1037,7 @@ static CURLcode smtp_state_command_resp(struct Curl_easy *data, int smtpcode, if((smtp->rcpt && smtpcode/100 != 2 && smtpcode != 553 && smtpcode != 1) || (!smtp->rcpt && smtpcode/100 != 2 && smtpcode != 1)) { failf(data, "Command failed: %d", smtpcode); - result = CURLE_RECV_ERROR; + result = CURLE_WEIRD_SERVER_REPLY; } else { /* Temporarily add the LF character back and send as body to the client */ @@ -1182,7 +1182,7 @@ static CURLcode smtp_state_postdata_resp(struct Curl_easy *data, (void)instate; /* no use for this yet */ if(smtpcode != 250) - result = CURLE_RECV_ERROR; + result = CURLE_WEIRD_SERVER_REPLY; /* End of DONE phase */ state(data, SMTP_STOP); diff --git a/tests/data/test852 b/tests/data/test852 index 8e608eb57..2234087ee 100644 --- a/tests/data/test852 +++ b/tests/data/test852 @@ -34,7 +34,7 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -l -u user:secret # Verify data after the test has been "shot" <verify> <errorcode> -56 +8 </errorcode> <protocol> CAPA
diff --git a/tests/data/test855 b/tests/data/test855 index 24b1166c6..0ab1ab397 100644 --- a/tests/data/test855 +++ b/tests/data/test855 @@ -34,7 +34,7 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret # Verify data after the test has been "shot" <verify> <errorcode> -56 +8 </errorcode> <protocol> CAPA
diff --git a/tests/data/test926 b/tests/data/test926 index aed6f4b8d..248cce9a7 100644 --- a/tests/data/test926 +++ b/tests/data/test926 @@ -31,9 +31,9 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient # # Verify data after the test has been "shot" <verify> -# 56 - CURLE_RECV_ERROR +# 8 - CURLE_WEIRD_SERVER_REPLY <errorcode> -56 +8 </errorcode> <protocol> EHLO %TESTNUMBER
diff --git a/tests/data/test957 b/tests/data/test957 index 5859f92fc..097385fe2 100644 --- a/tests/data/test957 +++ b/tests/data/test957 @@ -38,9 +38,9 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Användaren # # Verify data after the test has been "shot" <verify> -# 56 - CURLE_RECV_ERROR +# 8 - CURLE_WEIRD_SERVER_REPLY <errorcode> -56 +8 </errorcode> <protocol> EHLO %TESTNUMBER
diff --git a/tests/data/test958 b/tests/data/test958 index ce3de3342..1df158084 100644 --- a/tests/data/test958 +++ b/tests/data/test958 @@ -38,9 +38,9 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Användaren@example.com # # Verify data after the test has been "shot" <verify> -# 56 - CURLE_RECV_ERROR +# 8 - CURLE_WEIRD_SERVER_REPLY <errorcode> -56 +8 </errorcode> <protocol> EHLO %TESTNUMBER
diff --git a/tests/data/test961 b/tests/data/test961 index 02e265353..9cd10f574 100644 --- a/tests/data/test961 +++ b/tests/data/test961 @@ -39,9 +39,9 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt user@åäö.se # # Verify data after the test has been "shot" <verify> -# 56 - CURLE_RECV_ERROR +# 8 - CURLE_WEIRD_SERVER_REPLY <errorcode> -56 +8 </errorcode> <protocol> EHLO %TESTNUMBER
|