You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2013/03/27 05:00:33 UTC
svn commit: r1461405 - in /subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_ra_neon/fetch.c subversion/libsvn_ra_neon/ra_neon.h
subversion/libsvn_ra_neon/util.c
Author: svn-role
Date: Wed Mar 27 04:00:32 2013
New Revision: 1461405
URL: http://svn.apache.org/r1461405
Log:
Reintegrate the 1.7.x-issue4257 branch:
* r1453780
Reject operations on some properties for activity resources.
Justification:
It's a SEGV.
Votes:
+1: philip, breser, stefan2
* ^/subversion/branches/1.7.x-issue4257
Fix issue #4257 ("neon get_dir leads to bogus NODES rows").
Justification:
Bug can tigger assertions in the WCDB code.
Branch:
^/subversion/branches/1.7.x-issue4257
Notes:
While not strictly related to this issue, svn_ra_neon__do_stat()
could probably stand to have the same patch applied as
svn_ra_neon__get_dir(), as this pattern of using full URLs
was found to be troublesome in issue #4332's research, too.
Votes:
+1: cmpilato, breser, rhuijben
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_ra_neon/fetch.c
subversion/branches/1.7.x/subversion/libsvn_ra_neon/ra_neon.h
subversion/branches/1.7.x/subversion/libsvn_ra_neon/util.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/branches/1.7.x-issue4257:r1454456-1461404
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1461405&r1=1461404&r2=1461405&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Mar 27 04:00:32 2013
@@ -282,20 +282,6 @@ Approved changes:
Votes:
+1: philip, breser, stefan2
- * ^/subversion/branches/1.7.x-issue4257
- Fix issue #4257 ("neon get_dir leads to bogus NODES rows").
- Justification:
- Bug can tigger assertions in the WCDB code.
- Branch:
- ^/subversion/branches/1.7.x-issue4257
- Notes:
- While not strictly related to this issue, svn_ra_neon__do_stat()
- could probably stand to have the same patch applied as
- svn_ra_neon__get_dir(), as this pattern of using full URLs
- was found to be troublesome in issue #4332's research, too.
- Votes:
- +1: cmpilato, breser, rhuijben
-
* r1425368
Use the right api for generating the repository dirent in mod_dav_svn.
Justification:
Modified: subversion/branches/1.7.x/subversion/libsvn_ra_neon/fetch.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_ra_neon/fetch.c?rev=1461405&r1=1461404&r2=1461405&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_ra_neon/fetch.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_ra_neon/fetch.c Wed Mar 27 04:00:32 2013
@@ -796,7 +796,7 @@ svn_error_t *svn_ra_neon__get_dir(svn_ra
need to create a bc_url. */
if ((! SVN_IS_VALID_REVNUM(revision)) && (fetched_rev == NULL))
{
- final_url = url;
+ SVN_ERR(svn_ra_neon__get_url_path(&final_url, url, pool));
}
else
{
Modified: subversion/branches/1.7.x/subversion/libsvn_ra_neon/ra_neon.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_ra_neon/ra_neon.h?rev=1461405&r1=1461404&r2=1461405&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_ra_neon/ra_neon.h (original)
+++ subversion/branches/1.7.x/subversion/libsvn_ra_neon/ra_neon.h Wed Mar 27 04:00:32 2013
@@ -1173,6 +1173,13 @@ const char *
svn_ra_neon__uri_unparse(const ne_uri *uri,
apr_pool_t *pool);
+/* Wrapper around ne_uri_parse() which parses a URL and returns only
+ the server path portion thereof. */
+svn_error_t *
+svn_ra_neon__get_url_path(const char **urlpath,
+ const char *url,
+ apr_pool_t *pool);
+
/* Sets *SUPPORTS_DEADPROP_COUNT to non-zero if server supports
* deadprop-count property. Uses FINAL_URL to discover this informationn
* if it is not already cached. */
Modified: subversion/branches/1.7.x/subversion/libsvn_ra_neon/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_ra_neon/util.c?rev=1461405&r1=1461404&r2=1461405&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_ra_neon/util.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_ra_neon/util.c Wed Mar 27 04:00:32 2013
@@ -1600,6 +1600,29 @@ svn_ra_neon__uri_unparse(const ne_uri *u
return result;
}
+svn_error_t *
+svn_ra_neon__get_url_path(const char **urlpath,
+ const char *url,
+ apr_pool_t *pool)
+{
+ ne_uri parsed_url;
+ svn_error_t *err = SVN_NO_ERROR;
+
+ ne_uri_parse(url, &parsed_url);
+ if (parsed_url.path)
+ {
+ *urlpath = apr_pstrdup(pool, parsed_url.path);
+ }
+ else
+ {
+ err = svn_error_createf(SVN_ERR_RA_ILLEGAL_URL, NULL,
+ _("Neon was unable to parse URL '%s'"), url);
+ }
+ ne_uri_free(&parsed_url);
+
+ return err;
+}
+
/* Sets *SUPPORTS_DEADPROP_COUNT to non-zero if server supports
* deadprop-count property. */
svn_error_t *
Re: svn commit: r1461405 - in /subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_ra_neon/fetch.c subversion/libsvn_ra_neon/ra_neon.h
subversion/libsvn_ra_neon/util.c
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
I'm not sure why this log message contains r1453780 too? The mergeinfo
diff doesn't list that revision.
Perhaps it's due to the line with four spaces between the two entries...
svn-role@apache.org wrote on Wed, Mar 27, 2013 at 04:00:33 -0000:
> Author: svn-role
> Date: Wed Mar 27 04:00:32 2013
> New Revision: 1461405
>
> URL: http://svn.apache.org/r1461405
> Log:
> Reintegrate the 1.7.x-issue4257 branch:
>
> * r1453780
> Reject operations on some properties for activity resources.
> Justification:
> It's a SEGV.
> Votes:
> +1: philip, breser, stefan2
>
> * ^/subversion/branches/1.7.x-issue4257
> Fix issue #4257 ("neon get_dir leads to bogus NODES rows").
> Justification:
> Bug can tigger assertions in the WCDB code.
> Branch:
> ^/subversion/branches/1.7.x-issue4257
> Notes:
> While not strictly related to this issue, svn_ra_neon__do_stat()
> could probably stand to have the same patch applied as
> svn_ra_neon__get_dir(), as this pattern of using full URLs
> was found to be troublesome in issue #4332's research, too.
> Votes:
> +1: cmpilato, breser, rhuijben
>
> Modified:
> subversion/branches/1.7.x/ (props changed)
> subversion/branches/1.7.x/STATUS
> subversion/branches/1.7.x/subversion/libsvn_ra_neon/fetch.c
> subversion/branches/1.7.x/subversion/libsvn_ra_neon/ra_neon.h
> subversion/branches/1.7.x/subversion/libsvn_ra_neon/util.c
>
> Propchange: subversion/branches/1.7.x/
> ------------------------------------------------------------------------------
> Merged /subversion/branches/1.7.x-issue4257:r1454456-1461404
>
> Modified: subversion/branches/1.7.x/STATUS
> URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1461405&r1=1461404&r2=1461405&view=diff
> ==============================================================================
> --- subversion/branches/1.7.x/STATUS (original)
> +++ subversion/branches/1.7.x/STATUS Wed Mar 27 04:00:32 2013
> @@ -282,20 +282,6 @@ Approved changes:
> Votes:
> +1: philip, breser, stefan2
>
> - * ^/subversion/branches/1.7.x-issue4257
> - Fix issue #4257 ("neon get_dir leads to bogus NODES rows").
> - Justification:
> - Bug can tigger assertions in the WCDB code.
> - Branch:
> - ^/subversion/branches/1.7.x-issue4257
> - Notes:
> - While not strictly related to this issue, svn_ra_neon__do_stat()
> - could probably stand to have the same patch applied as
> - svn_ra_neon__get_dir(), as this pattern of using full URLs
> - was found to be troublesome in issue #4332's research, too.
> - Votes:
> - +1: cmpilato, breser, rhuijben
> -
> * r1425368
> Use the right api for generating the repository dirent in mod_dav_svn.
> Justification:
>
> Modified: subversion/branches/1.7.x/subversion/libsvn_ra_neon/fetch.c
> Modified: subversion/branches/1.7.x/subversion/libsvn_ra_neon/ra_neon.h
> Modified: subversion/branches/1.7.x/subversion/libsvn_ra_neon/util.c
Re: svn commit: r1461405 - in /subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_ra_neon/fetch.c subversion/libsvn_ra_neon/ra_neon.h
subversion/libsvn_ra_neon/util.c
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
I'm not sure why this log message contains r1453780 too? The mergeinfo
diff doesn't list that revision.
Perhaps it's due to the line with four spaces between the two entries...
svn-role@apache.org wrote on Wed, Mar 27, 2013 at 04:00:33 -0000:
> Author: svn-role
> Date: Wed Mar 27 04:00:32 2013
> New Revision: 1461405
>
> URL: http://svn.apache.org/r1461405
> Log:
> Reintegrate the 1.7.x-issue4257 branch:
>
> * r1453780
> Reject operations on some properties for activity resources.
> Justification:
> It's a SEGV.
> Votes:
> +1: philip, breser, stefan2
>
> * ^/subversion/branches/1.7.x-issue4257
> Fix issue #4257 ("neon get_dir leads to bogus NODES rows").
> Justification:
> Bug can tigger assertions in the WCDB code.
> Branch:
> ^/subversion/branches/1.7.x-issue4257
> Notes:
> While not strictly related to this issue, svn_ra_neon__do_stat()
> could probably stand to have the same patch applied as
> svn_ra_neon__get_dir(), as this pattern of using full URLs
> was found to be troublesome in issue #4332's research, too.
> Votes:
> +1: cmpilato, breser, rhuijben
>
> Modified:
> subversion/branches/1.7.x/ (props changed)
> subversion/branches/1.7.x/STATUS
> subversion/branches/1.7.x/subversion/libsvn_ra_neon/fetch.c
> subversion/branches/1.7.x/subversion/libsvn_ra_neon/ra_neon.h
> subversion/branches/1.7.x/subversion/libsvn_ra_neon/util.c
>
> Propchange: subversion/branches/1.7.x/
> ------------------------------------------------------------------------------
> Merged /subversion/branches/1.7.x-issue4257:r1454456-1461404
>
> Modified: subversion/branches/1.7.x/STATUS
> URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1461405&r1=1461404&r2=1461405&view=diff
> ==============================================================================
> --- subversion/branches/1.7.x/STATUS (original)
> +++ subversion/branches/1.7.x/STATUS Wed Mar 27 04:00:32 2013
> @@ -282,20 +282,6 @@ Approved changes:
> Votes:
> +1: philip, breser, stefan2
>
> - * ^/subversion/branches/1.7.x-issue4257
> - Fix issue #4257 ("neon get_dir leads to bogus NODES rows").
> - Justification:
> - Bug can tigger assertions in the WCDB code.
> - Branch:
> - ^/subversion/branches/1.7.x-issue4257
> - Notes:
> - While not strictly related to this issue, svn_ra_neon__do_stat()
> - could probably stand to have the same patch applied as
> - svn_ra_neon__get_dir(), as this pattern of using full URLs
> - was found to be troublesome in issue #4332's research, too.
> - Votes:
> - +1: cmpilato, breser, rhuijben
> -
> * r1425368
> Use the right api for generating the repository dirent in mod_dav_svn.
> Justification:
>
> Modified: subversion/branches/1.7.x/subversion/libsvn_ra_neon/fetch.c
> Modified: subversion/branches/1.7.x/subversion/libsvn_ra_neon/ra_neon.h
> Modified: subversion/branches/1.7.x/subversion/libsvn_ra_neon/util.c