Date: Tue, 27 May 2014 04:39:03 +0000 (UTC) From: Peter Wemm <peter@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r266726 - in vendor/serf/dist: . auth Message-ID: <201405270439.s4R4d3C1071308@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: peter Date: Tue May 27 04:39:03 2014 New Revision: 266726 URL: http://svnweb.freebsd.org/changeset/base/266726 Log: Vendor import serf-1.3.5 Modified: vendor/serf/dist/CHANGES vendor/serf/dist/auth/auth.c vendor/serf/dist/auth/auth_spnego.c vendor/serf/dist/outgoing.c vendor/serf/dist/serf.h vendor/serf/dist/ssltunnel.c Modified: vendor/serf/dist/CHANGES ============================================================================== --- vendor/serf/dist/CHANGES Tue May 27 04:30:56 2014 (r266725) +++ vendor/serf/dist/CHANGES Tue May 27 04:39:03 2014 (r266726) @@ -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) Modified: vendor/serf/dist/auth/auth.c ============================================================================== --- vendor/serf/dist/auth/auth.c Tue May 27 04:30:56 2014 (r266725) +++ vendor/serf/dist/auth/auth.c Tue May 27 04:39:03 2014 (r266726) @@ -408,6 +408,7 @@ apr_status_t serf__handle_auth_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; } Modified: vendor/serf/dist/auth/auth_spnego.c ============================================================================== --- vendor/serf/dist/auth/auth_spnego.c Tue May 27 04:30:56 2014 (r266725) +++ vendor/serf/dist/auth/auth_spnego.c Tue May 27 04:39:03 2014 (r266726) @@ -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, Modified: vendor/serf/dist/outgoing.c ============================================================================== --- vendor/serf/dist/outgoing.c Tue May 27 04:30:56 2014 (r266725) +++ vendor/serf/dist/outgoing.c Tue May 27 04:39:03 2014 (r266726) @@ -916,21 +916,22 @@ static apr_status_t handle_response(serf * 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) { Modified: vendor/serf/dist/serf.h ============================================================================== --- vendor/serf/dist/serf.h Tue May 27 04:30:56 2014 (r266725) +++ vendor/serf/dist/serf.h Tue May 27 04:39:03 2014 (r266726) @@ -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) "." \ Modified: vendor/serf/dist/ssltunnel.c ============================================================================== --- vendor/serf/dist/ssltunnel.c Tue May 27 04:30:56 2014 (r266725) +++ vendor/serf/dist/ssltunnel.c Tue May 27 04:39:03 2014 (r266726) @@ -70,12 +70,11 @@ static apr_status_t handle_response(serf 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)) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405270439.s4R4d3C1071308>