diff options
author | peter <peter@FreeBSD.org> | 2014-05-27 04:52:32 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2014-05-27 04:52:32 +0000 |
commit | 20eb9148a2d9ce8554aaf5a7e41cf23cd6a9e2fb (patch) | |
tree | 058bc3f784d6bd7edece1de1cfc5a3cdaaa021f6 /contrib/serf | |
parent | 418c5c97b2c06e1fdf86dc210ba28056a9502d35 (diff) | |
download | FreeBSD-src-20eb9148a2d9ce8554aaf5a7e41cf23cd6a9e2fb.zip FreeBSD-src-20eb9148a2d9ce8554aaf5a7e41cf23cd6a9e2fb.tar.gz |
Update serf 1.3.4 -> 1.3.5
Diffstat (limited to 'contrib/serf')
-rw-r--r-- | contrib/serf/CHANGES | 9 | ||||
-rw-r--r-- | contrib/serf/auth/auth.c | 1 | ||||
-rw-r--r-- | contrib/serf/auth/auth_spnego.c | 3 | ||||
-rw-r--r-- | contrib/serf/outgoing.c | 31 | ||||
-rw-r--r-- | contrib/serf/serf.h | 2 | ||||
-rw-r--r-- | contrib/serf/ssltunnel.c | 9 |
6 files changed, 31 insertions, 24 deletions
diff --git a/contrib/serf/CHANGES b/contrib/serf/CHANGES index e4e1c89..64eaaa3 100644 --- a/contrib/serf/CHANGES +++ b/contrib/serf/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/contrib/serf/auth/auth.c b/contrib/serf/auth/auth.c index 6ba3ba5..8117091 100644 --- a/contrib/serf/auth/auth.c +++ b/contrib/serf/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/contrib/serf/auth/auth_spnego.c b/contrib/serf/auth/auth_spnego.c index c0ad27e..e55fad2 100644 --- a/contrib/serf/auth/auth_spnego.c +++ b/contrib/serf/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/contrib/serf/outgoing.c b/contrib/serf/outgoing.c index 3fc726c..0d0e5e2 100644 --- a/contrib/serf/outgoing.c +++ b/contrib/serf/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/contrib/serf/serf.h b/contrib/serf/serf.h index c28703f..55d6a3a 100644 --- a/contrib/serf/serf.h +++ b/contrib/serf/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/contrib/serf/ssltunnel.c b/contrib/serf/ssltunnel.c index 28ca127..0ad04d6 100644 --- a/contrib/serf/ssltunnel.c +++ b/contrib/serf/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)) { |