aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>2014-05-27 04:39:03 +0000
committerPeter Wemm <peter@FreeBSD.org>2014-05-27 04:39:03 +0000
commit08a60c7e0c84f2e87393c45f74ebca226b7d0fdb (patch)
treee2b6d2d264043e7026d39b562162c92379814611
parent8fb9cce2ff815627d3bb41281dbb4c67c240f283 (diff)
downloadsrc-08a60c7e0c84f2e87393c45f74ebca226b7d0fdb.tar.gz
src-08a60c7e0c84f2e87393c45f74ebca226b7d0fdb.zip
Vendor import serf-1.3.5vendor/serf/serf-1.3.5
Notes
Notes: svn path=/vendor/serf/dist/; revision=266726 svn path=/vendor/serf/serf-1.3.5/; revision=266727; tag=vendor/serf/serf-1.3.5
-rw-r--r--CHANGES9
-rw-r--r--auth/auth.c1
-rw-r--r--auth/auth_spnego.c3
-rw-r--r--outgoing.c31
-rw-r--r--serf.h2
-rw-r--r--ssltunnel.c9
6 files changed, 31 insertions, 24 deletions
diff --git a/CHANGES b/CHANGES
index e4e1c892b78e..64eaaa3b5582 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,11 @@
-Serf 1.3.4 [2014-02-08, from /tags/1.3.4, rxxxx]
+Serf 1.3.5 [2014-04-27, from /tags/1.3.5, rxxxx]
+ Fix issue #125: no reverse lookup during Negotiate authentication for proxies.
+ Fix a crash caused by incorrect reuse of the ssltunnel CONNECT request (r2316)
+ Cancel request if response parsing failed + authn callback set (r2319)
+ Update the expired certificates in the test suite.
+
+
+Serf 1.3.4 [2014-02-08, from /tags/1.3.4, r2310]
Fix issue #119: Endless loop during ssl tunnel setup with Negotiate authn
Fix issue #123: Can't setup ssl tunnel which sends Connection close header
Fix a race condition when initializing OpenSSL from multiple threads (r2263)
diff --git a/auth/auth.c b/auth/auth.c
index 6ba3ba5ab59e..811709122a8c 100644
--- a/auth/auth.c
+++ b/auth/auth.c
@@ -408,6 +408,7 @@ apr_status_t serf__handle_auth_response(int *consumed_response,
consider the reponse body as invalid and discard it. */
status = discard_body(response);
*consumed_response = 1;
+
if (!APR_STATUS_IS_EOF(status)) {
return status;
}
diff --git a/auth/auth_spnego.c b/auth/auth_spnego.c
index c0ad27e362da..e55fad2ae938 100644
--- a/auth/auth_spnego.c
+++ b/auth/auth_spnego.c
@@ -335,8 +335,7 @@ do_auth(peer_t peer,
&tmp, &tmp_len,
gss_info);
} else {
- char *proxy_host;
- apr_getnameinfo(&proxy_host, conn->ctx->proxy_address, 0);
+ char *proxy_host = conn->ctx->proxy_address->hostname;
status = gss_api_get_credentials(conn,
token, token_len, proxy_host,
&tmp, &tmp_len,
diff --git a/outgoing.c b/outgoing.c
index 3fc726c038e4..0d0e5e2e1c9a 100644
--- a/outgoing.c
+++ b/outgoing.c
@@ -916,21 +916,22 @@ static apr_status_t handle_response(serf_request_t *request,
* themselves by not registering credential callbacks.
*/
if (request->conn->ctx->cred_cb) {
- status = serf__handle_auth_response(&consumed_response,
- request,
- request->resp_bkt,
- request->handler_baton,
- pool);
-
- /* If there was an error reading the response (maybe there wasn't
- enough data available), don't bother passing the response to the
- application.
-
- If the authentication was tried, but failed, pass the response
- to the application, maybe it can do better. */
- if (status) {
- return status;
- }
+ status = serf__handle_auth_response(&consumed_response,
+ request,
+ request->resp_bkt,
+ request->handler_baton,
+ pool);
+
+ if (SERF_BUCKET_READ_ERROR(status)) {
+ /* Report the request as 'died'/'cancelled' to the application */
+ (void)(*request->handler)(request,
+ NULL,
+ request->handler_baton,
+ pool);
+ }
+
+ if (status)
+ return status;
}
if (!consumed_response) {
diff --git a/serf.h b/serf.h
index c28703f0c1c4..55d6a3a1b43e 100644
--- a/serf.h
+++ b/serf.h
@@ -1062,7 +1062,7 @@ void serf_debug__bucket_alloc_check(
/* Version info */
#define SERF_MAJOR_VERSION 1
#define SERF_MINOR_VERSION 3
-#define SERF_PATCH_VERSION 4
+#define SERF_PATCH_VERSION 5
/* Version number string */
#define SERF_VERSION_STRING APR_STRINGIFY(SERF_MAJOR_VERSION) "." \
diff --git a/ssltunnel.c b/ssltunnel.c
index 28ca12700447..0ad04d677036 100644
--- a/ssltunnel.c
+++ b/ssltunnel.c
@@ -70,12 +70,11 @@ static apr_status_t handle_response(serf_request_t *request,
req_ctx_t *ctx = handler_baton;
serf_connection_t *conn = request->conn;
- if (! response) {
- serf_connection_request_create(conn,
- setup_request,
- ctx);
+ /* CONNECT request was cancelled. Assuming that this is during connection
+ reset, we can safely discard the request as a new one will be created
+ when setting up the next connection. */
+ if (!response)
return APR_SUCCESS;
- }
status = serf_bucket_response_status(response, &sl);
if (SERF_BUCKET_READ_ERROR(status)) {