diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/http.c | 3 | ||||
| -rw-r--r-- | lib/ssluse.c | 9 | ||||
| -rw-r--r-- | lib/transfer.c | 26 | ||||
| -rw-r--r-- | lib/url.c | 13 | ||||
| -rw-r--r-- | lib/urldata.h | 6 |
5 files changed, 54 insertions, 3 deletions
diff --git a/lib/http.c b/lib/http.c index aa5a64dc0..d710ff5f4 100644 --- a/lib/http.c +++ b/lib/http.c @@ -617,6 +617,9 @@ CURLcode Curl_http_done(struct connectdata *conn) conn->fread = data->set.fread; /* restore */ conn->fread_in = data->set.in; /* restore */ + if (http == NULL) + return CURLE_OK; + if(http->send_buffer) { send_buffer *buff = http->send_buffer; diff --git a/lib/ssluse.c b/lib/ssluse.c index b4af2ba0d..8e8f5eeb2 100644 --- a/lib/ssluse.c +++ b/lib/ssluse.c @@ -831,6 +831,15 @@ Curl_SSLConnect(struct connectdata *conn) else SSL_CTX_set_verify(conn->ssl.ctx, SSL_VERIFY_NONE, cert_verify_callback); + /* give application a chance to interfere with SSL set up. */ + if (data->set.ssl.fsslctx) { + CURLcode callbackresult = (*data->set.ssl.fsslctx)(data, conn->ssl.ctx, + data->set.ssl.fsslctxp); + if (callbackresult != CURLE_OK) { + failf(data,"error signaled by ssl ctx callback"); + return callbackresult; + } + } /* Lets make an SSL structure */ conn->ssl.handle = SSL_new (conn->ssl.ctx); diff --git a/lib/transfer.c b/lib/transfer.c index e98e1e01b..98cf70c1d 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -1889,9 +1889,29 @@ CURLcode Curl_perform(struct SessionHandle *data) * performed after this do-while loop. */ - do { - Curl_pgrsTime(data, TIMER_STARTSINGLE); - res = Curl_connect(data, &conn); + do { + int urlchanged = FALSE; + do { + Curl_pgrsTime(data, TIMER_STARTSINGLE); + data->change.url_changed = FALSE; + res = Curl_connect(data, &conn); + + /* If a callback (or something) has altered the URL we should use within + the Curl_connect(), we detect it here and act as if we are redirected + to the new URL */ + urlchanged = data->change.url_changed; + if ((CURLE_OK == res) && urlchanged) { + char *newurl; + res = Curl_done(conn); + if(CURLE_OK == res) { + newurl = strdup(data->change.url); + res = Curl_follow(data, newurl); + if(res) + free(newurl); + } + } + } while (urlchanged && res == CURLE_OK) ; + if(res == CURLE_OK) { res = Curl_do(&conn); @@ -723,6 +723,7 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, ...) } data->set.set_url = va_arg(param, char *); data->change.url = data->set.set_url; + data->change.url_changed = TRUE; break; case CURLOPT_PORT: /* @@ -1091,6 +1092,18 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, ...) */ data->set.ssl.verifyhost = va_arg(param, long); break; + case CURLOPT_SSL_CTX_FUNCTION: + /* + * Set a SSL_CTX callback + */ + data->set.ssl.fsslctx = va_arg(param, curl_ssl_ctx_callback); + break; + case CURLOPT_SSL_CTX_DATA: + /* + * Set a SSL_CTX callback parameter pointer + */ + data->set.ssl.fsslctxp = va_arg(param, void *); + break; case CURLOPT_CAINFO: /* * Set CA info for SSL connection. Specify file name of the CA certificate diff --git a/lib/urldata.h b/lib/urldata.h index f892968e9..dab214ce3 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -145,6 +145,8 @@ struct ssl_config_data { char *egdsocket; /* path to file containing the EGD daemon socket */ char *cipher_list; /* list of ciphers to use */ long numsessions; /* SSL session id cache size */ + curl_ssl_ctx_callback fsslctx; /* function to initialize ssl ctx */ + void *fsslctxp; /*parameter for call back */ }; /* information stored about one single SSL session */ @@ -677,6 +679,10 @@ struct UrlState { struct DynamicStatic { char *url; /* work URL, copied from UserDefined */ bool url_alloc; /* URL string is malloc()'ed */ + bool url_changed; /* set on CURL_OPT_URL, used to detect if the URL was + changed after the connect phase, as we allow callback + to change it and if so, we reconnect to use the new + URL instead */ char *proxy; /* work proxy, copied from UserDefined */ bool proxy_alloc; /* http proxy string is malloc()'ed */ char *referer; /* referer string */ |