Here's another crack at correcting ra_serf's handling of explicitly requested non-existent properties.
-- C. Michael Pilato <cmpil...@collab.net> CollabNet <> www.collab.net <> Enterprise Cloud Development
Give ra_serf the power to properly recognize non-existent properties
explicitly requested, take 2.
* subversion/libsvn_ra_serf/property.c
(prop_state_e): Add STATUS state.
(propfind_context_t): Add 'ps_props' member.
(propfind_ttable): Add record for STATUS state, and flip the bit
that lets us handle the "propstat" closure with our custom
callback.
(parse_status_code): New helper function.
(propfind_opened): When entering PROPSTAT state, create the
'ps_props' hash.
(propfind_closed): Handle the STATUS closure, parsing the status
code and leaving a note if it indicates that the property value
isn't worthy of remembrance. In the PROPVAL closure, store
properties temporarily in the new 'ps_props' hash. Now handle the
PROPSTAT closure, where we can finally consult that status note
and copy keepable properties from the 'ps_props' hash to the
'ret_props' hash (and destroy the 'ps_props' hash).
Index: subversion/libsvn_ra_serf/property.c
===================================================================
--- subversion/libsvn_ra_serf/property.c (revision 1352630)
+++ subversion/libsvn_ra_serf/property.c (working copy)
@@ -46,6 +46,7 @@
RESPONSE,
HREF,
PROPSTAT,
+ STATUS,
PROP,
PROPVAL,
COLLECTION,
@@ -86,6 +87,13 @@
*/
apr_hash_t *ret_props;
+ /* hash table containing all the properties associated with the
+ * "current" <propstat> tag. These will get copied into RET_PROPS
+ * if the status code similarly associated indicates that they are
+ * "good"; otherwise, they'll get discarded.
+ */
+ apr_hash_t *ps_props;
+
/* If not-NULL, add us to this list when we're done. */
svn_ra_serf__list_t **done_list;
@@ -107,8 +115,11 @@
TRUE, { NULL }, TRUE },
{ RESPONSE, D_, "propstat", PROPSTAT,
- FALSE, { NULL }, FALSE },
+ FALSE, { NULL }, TRUE },
+ { PROPSTAT, D_, "status", STATUS,
+ TRUE, { NULL }, TRUE },
+
{ PROPSTAT, D_, "prop", PROP,
FALSE, { NULL }, FALSE },
@@ -125,6 +136,29 @@
};
+/* Return the HTTP status code contained in STATUS_LINE, or 0 if
+ there's a problem parsing it. */
+static int parse_status_code(const char *status_line)
+{
+ /* STATUS_LINE should be of form: "HTTP/1.1 200 OK" */
+ if (status_line[0] == 'H' &&
+ status_line[1] == 'T' &&
+ status_line[2] == 'T' &&
+ status_line[3] == 'P' &&
+ status_line[4] == '/' &&
+ (status_line[5] >= '0' && status_line[5] <= '9') &&
+ status_line[6] == '.' &&
+ (status_line[7] >= '0' && status_line[7] <= '9') &&
+ status_line[8] == ' ')
+ {
+ char *reason;
+
+ return apr_strtoi64(status_line + 8, &reason, 10);
+ }
+ return 0;
+}
+
+
/* Conforms to svn_ra_serf__xml_opened_t */
static svn_error_t *
propfind_opened(svn_ra_serf__xml_estate_t *xes,
@@ -133,11 +167,17 @@
const svn_ra_serf__dav_props_t *tag,
apr_pool_t *scratch_pool)
{
+ propfind_context_t *ctx = baton;
+
if (entered_state == PROPVAL)
{
svn_ra_serf__xml_note(xes, PROPVAL, "ns", tag->namespace);
svn_ra_serf__xml_note(xes, PROPVAL, "name", tag->name);
}
+ else if (entered_state == PROPSTAT)
+ {
+ ctx->ps_props = apr_hash_make(ctx->pool);
+ }
return SVN_NO_ERROR;
}
@@ -193,8 +233,18 @@
{
svn_ra_serf__xml_note(xes, PROPVAL, "altvalue", cdata->data);
}
- else
+ else if (leaving_state == STATUS)
{
+ /* Parse the status field, and remember if this is a property
+ that we wish to ignore. (Typically, if it's not a 200, the
+ status will be 404 to indicate that a property we
+ specifically requested from the server doesn't exist.) */
+ int status = parse_status_code(cdata->data);
+ if (status != 200)
+ svn_ra_serf__xml_note(xes, PROPSTAT, "ignore-prop", "*");
+ }
+ else if (leaving_state == PROPVAL)
+ {
const char *encoding = apr_hash_get(attrs, "V:encoding",
APR_HASH_KEY_STRING);
const svn_string_t *val_str;
@@ -204,8 +254,6 @@
const char *name;
const char *altvalue;
- SVN_ERR_ASSERT(leaving_state == PROPVAL);
-
if (encoding)
{
if (strcmp(encoding, "base64") != 0)
@@ -225,7 +273,16 @@
/* The current path sits on the RESPONSE state. Gather up all the
state from this PROPVAL to the (grandparent) RESPONSE state,
- and grab the path from there. */
+ and grab the path from there.
+
+ Now, it would be nice if we could, at this point, know that
+ the status code for this property indicated a problem -- then
+ we could simply bail out here and ignore the property.
+ Sadly, though, we might get the status code *after* we get
+ the property value. So we'll carry on with our processing
+ here, setting the property and value as expected. Once we
+ know for sure the status code associate with the property,
+ we'll decide its fate. */
gathered = svn_ra_serf__xml_gather_since(xes, RESPONSE);
/* These will be dup'd into CTX->POOL, as necessary. */
@@ -233,19 +290,47 @@
if (path == NULL)
path = ctx->path;
- ns = apr_hash_get(attrs, "ns", APR_HASH_KEY_STRING);
+ ns = apr_hash_get(gathered, "ns", APR_HASH_KEY_STRING);
name = apr_pstrdup(ctx->pool,
- apr_hash_get(attrs, "name", APR_HASH_KEY_STRING));
+ apr_hash_get(gathered, "name", APR_HASH_KEY_STRING));
altvalue = apr_hash_get(attrs, "altvalue", APR_HASH_KEY_STRING);
if (altvalue != NULL)
val_str = svn_string_create(altvalue, ctx->pool);
- svn_ra_serf__set_ver_prop(ctx->ret_props,
+ svn_ra_serf__set_ver_prop(ctx->ps_props,
path, ctx->rev, ns, name, val_str,
ctx->pool);
}
+ else
+ {
+ apr_hash_t *gathered;
+ SVN_ERR_ASSERT(leaving_state == PROPSTAT);
+
+ /* If we've squirreled away a note that says we want to ignore
+ these properties, we'll do so. Otherwise, we need to copy
+ them from the temporary hash into the ctx->ret_props hash. */
+ gathered = svn_ra_serf__xml_gather_since(xes, RESPONSE);
+ if (! apr_hash_get(gathered, "ignore-prop", APR_HASH_KEY_STRING))
+ {
+ apr_hash_index_t *hi;
+
+ for (hi = apr_hash_first(scratch_pool, ctx->ps_props);
+ hi;
+ hi = apr_hash_next(hi))
+ {
+ const void *key;
+ apr_ssize_t keylen;
+ void *val;
+
+ apr_hash_this(hi, &key, &keylen, &val);
+ apr_hash_set(ctx->ret_props, key, keylen, val);
+ }
+ }
+ ctx->ps_props = NULL;
+ }
+
return SVN_NO_ERROR;
}
signature.asc
Description: OpenPGP digital signature
