Author: lgo
Date: Sat Dec 26 18:34:01 2009
New Revision: 894014
URL: http://svn.apache.org/viewvc?rev=894014&view=rev
Log:
Make ra_serf other (slightly higher level) functions from the serf API
to create connections and set up request buckets. With this functions
we pass the hostname to serf instead of the IP address. This enables
serf to add the necessary headers to support proxy servers and is also
needed for the upcoming authentication handlers in serf.
* subversion/libsvn_ra_serf/serf.c
(svn_ra_serf__open): Use serf_connection_create2 and pass the
full url instead of the server address.
* subversion/libsvn_ra_serf/util.c
(svn_ra_serf__setup_serf_req): Use the wrapper function
serf_request_bucket_request_create to create the request bucket.
No need to set the repository root anymore on each request bucket,
serf will now do that for us.
* subversion/libsvn_ra_serf/update.c
(open_connection_if_needed): Use serf_connection_create2 here too.
Pass an address lookup error back to the caller.
(finish_report): Wrap the call to open_connection_if_needed with
SVN_ERR.
Modified:
subversion/trunk/subversion/libsvn_ra_serf/serf.c
subversion/trunk/subversion/libsvn_ra_serf/update.c
subversion/trunk/subversion/libsvn_ra_serf/util.c
Modified: subversion/trunk/subversion/libsvn_ra_serf/serf.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/serf.c?rev=894014&r1=894013&r2=894014&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/serf.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/serf.c Sat Dec 26 18:34:01 2009
@@ -430,11 +430,15 @@
serf_sess->conns[0]->useragent = USER_AGENT;
/* go ahead and tell serf about the connection. */
- serf_sess->conns[0]->conn =
- serf_connection_create(serf_sess->context, serf_sess->conns[0]->address,
- svn_ra_serf__conn_setup, serf_sess->conns[0],
- svn_ra_serf__conn_closed, serf_sess->conns[0],
- serf_sess->pool);
+ status =
+ serf_connection_create2(&serf_sess->conns[0]->conn,
+ serf_sess->context,
+ url,
+ svn_ra_serf__conn_setup, serf_sess->conns[0],
+ svn_ra_serf__conn_closed, serf_sess->conns[0],
+ serf_sess->pool);
+ if (status)
+ return svn_error_wrap_apr(status, NULL);
/* Set the progress callback. */
serf_context_set_progress_cb(serf_sess->context, svn_ra_serf__progress,
Modified: subversion/trunk/subversion/libsvn_ra_serf/update.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/update.c?rev=894014&r1=894013&r2=894014&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/update.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/update.c Sat Dec 26 18:34:01 2009
@@ -2127,7 +2127,7 @@
* if the number of ACTIVE_REQS > REQS_PER_CONN or if there currently is
* only one main connection open.
*/
-static void
+static svn_error_t *
open_connection_if_needed(svn_ra_serf__session_t *sess, int active_reqs)
{
/* For each REQS_PER_CONN outstanding requests open a new connection, with
@@ -2136,6 +2136,7 @@
((active_reqs / REQS_PER_CONN) > sess->num_conns))
{
int cur = sess->num_conns;
+ apr_status_t status;
sess->conns[cur] = apr_palloc(sess->pool, sizeof(*sess->conns[cur]));
sess->conns[cur]->bkt_alloc = serf_bucket_allocator_create(sess->pool,
@@ -2150,13 +2151,17 @@
sess->conns[cur]->last_status_code = -1;
sess->conns[cur]->ssl_context = NULL;
sess->conns[cur]->session = sess;
- sess->conns[cur]->conn = serf_connection_create(sess->context,
-
sess->conns[cur]->address,
- svn_ra_serf__conn_setup,
- sess->conns[cur],
- svn_ra_serf__conn_closed,
- sess->conns[cur],
- sess->pool);
+ status = serf_connection_create2(&sess->conns[cur]->conn,
+ sess->context,
+ sess->repos_url,
+ svn_ra_serf__conn_setup,
+ sess->conns[cur],
+ svn_ra_serf__conn_closed,
+ sess->conns[cur],
+ sess->pool);
+ if (status)
+ return svn_error_wrap_apr(status, NULL);
+
sess->num_conns++;
/* Authentication protocol specific initalization. */
@@ -2166,6 +2171,8 @@
sess->proxy_auth_protocol->init_conn_func(sess, sess->conns[cur],
sess->pool);
}
+
+ return SVN_NO_ERROR;
}
static svn_error_t *
@@ -2220,7 +2227,7 @@
svn_ra_serf__request_create(handler);
/* Open the first extra connection. */
- open_connection_if_needed(sess, 0);
+ SVN_ERR(open_connection_if_needed(sess, 0));
sess->cur_conn = 1;
closed_root = FALSE;
@@ -2244,8 +2251,8 @@
/* Open extra connections if we have enough requests to send. */
if (sess->num_conns < MAX_NR_OF_CONNS)
- open_connection_if_needed(sess, report->active_fetches +
- report->active_propfinds);
+ SVN_ERR(open_connection_if_needed(sess, report->active_fetches +
+ report->active_propfinds));
/* Switch our connection. */
if (!report->done)
Modified: subversion/trunk/subversion/libsvn_ra_serf/util.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/util.c?rev=894014&r1=894013&r2=894014&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/util.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/util.c Sat Dec 26 18:34:01 2009
@@ -504,8 +504,9 @@
{
serf_bucket_t *hdrs_bkt;
- *req_bkt = serf_bucket_request_create(method, url, body_bkt,
- serf_request_get_alloc(request));
+ *req_bkt =
+ serf_request_bucket_request_create(request, method, url, body_bkt,
+ serf_request_get_alloc(request));
hdrs_bkt = serf_bucket_request_get_headers(*req_bkt);
serf_bucket_headers_setn(hdrs_bkt, "Host", conn->hostinfo);
@@ -553,15 +554,6 @@
}
#endif
- /* Set up Proxy settings */
- if (conn->session->using_proxy)
- {
- char *root = apr_uri_unparse(conn->session->pool,
- &conn->session->repos_url,
- APR_URI_UNP_OMITPATHINFO);
- serf_bucket_request_set_root(*req_bkt, root);
- }
-
if (ret_hdrs_bkt)
{
*ret_hdrs_bkt = hdrs_bkt;
