You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2013/07/26 03:28:32 UTC
svn commit: r1507175 [1/2] - in /subversion/branches/javahl-1.7-extensions:
./ CHANGES get-deps.sh subversion/include/svn_version.h
subversion/mod_dav_svn/repos.c subversion/po/zh_CN.po
Author: brane
Date: Fri Jul 26 01:28:32 2013
New Revision: 1507175
URL: http://svn.apache.org/r1507175
Log:
Sync the javahl-1.7-extensions branch with the 1.7.x branch up to r1507169.
Modified:
subversion/branches/javahl-1.7-extensions/ (props changed)
subversion/branches/javahl-1.7-extensions/CHANGES (contents, props changed)
subversion/branches/javahl-1.7-extensions/get-deps.sh
subversion/branches/javahl-1.7-extensions/subversion/include/svn_version.h
subversion/branches/javahl-1.7-extensions/subversion/mod_dav_svn/repos.c
subversion/branches/javahl-1.7-extensions/subversion/po/zh_CN.po
Propchange: subversion/branches/javahl-1.7-extensions/
------------------------------------------------------------------------------
Merged /subversion/branches/1.7.x:r1496323-1507169
Merged /subversion/trunk:r1503528
Modified: subversion/branches/javahl-1.7-extensions/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.7-extensions/CHANGES?rev=1507175&r1=1507174&r2=1507175&view=diff
==============================================================================
--- subversion/branches/javahl-1.7-extensions/CHANGES (original)
+++ subversion/branches/javahl-1.7-extensions/CHANGES Fri Jul 26 01:28:32 2013
@@ -1,3 +1,22 @@
+Version 1.7.11
+(23 Jul 2013, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.11
+
+ User-visible changes:
+ - General
+ * translation updates for Simplified Chinese
+
+ - Server-side bugfixes:
+ * mod_dav_svn: fix incorrect path canonicalization (r1503528)
+
+ - Other tool improvements and bugfixes:
+ * fix argument processing in contrib hook scripts (r1485350)
+
+ Developer-visible changes:
+ - Bindings:
+ * javahl: fix bug in error constructing code (r1405922)
+
+
Version 1.7.10
(30 May 2013, from /branches/1.7.x)
http://svn.apache.org/repos/asf/subversion/tags/1.7.10
@@ -76,7 +95,7 @@ http://svn.apache.org/repos/asf/subversi
* fix svn patch ignoring hunks after no trailing newline (r1399174)
* fix hang with ra_serf during error processing (r1403583)
* ignore file externals with mergeinfo when merging (r1401915)
- * fix SEGV with "svnmucc cp rev arg" during argv processing (issue #4079)
+ * fix "svnmucc cp" segfault with a missing last argument (issue #4079)
* fix conflict handling on symlinks (issue #4091)
- Server-side bugfixes:
Propchange: subversion/branches/javahl-1.7-extensions/CHANGES
------------------------------------------------------------------------------
Merged /subversion/trunk/CHANGES:r1485508,1503795,1503850
Merged /subversion/branches/1.7.x/CHANGES:r1496323-1507169
Modified: subversion/branches/javahl-1.7-extensions/get-deps.sh
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.7-extensions/get-deps.sh?rev=1507175&r1=1507174&r2=1507175&view=diff
==============================================================================
--- subversion/branches/javahl-1.7-extensions/get-deps.sh (original)
+++ subversion/branches/javahl-1.7-extensions/get-deps.sh Fri Jul 26 01:28:32 2013
@@ -33,7 +33,7 @@ SQLITE_VERSION_LIST=`echo $SQLITE_VERSIO
SQLITE=sqlite-amalgamation-`printf %d%02d%02d%02d $SQLITE_VERSION_LIST`
-HTTPD=httpd-2.2.19
+HTTPD=httpd-2.2.25
APR_ICONV=apr-iconv-1.2.1
BASEDIR=`pwd`
Modified: subversion/branches/javahl-1.7-extensions/subversion/include/svn_version.h
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.7-extensions/subversion/include/svn_version.h?rev=1507175&r1=1507174&r2=1507175&view=diff
==============================================================================
--- subversion/branches/javahl-1.7-extensions/subversion/include/svn_version.h (original)
+++ subversion/branches/javahl-1.7-extensions/subversion/include/svn_version.h Fri Jul 26 01:28:32 2013
@@ -71,7 +71,7 @@ extern "C" {
*
* @since New in 1.1.
*/
-#define SVN_VER_PATCH 10
+#define SVN_VER_PATCH 12
/** @deprecated Provided for backward compatibility with the 1.0 API. */
Modified: subversion/branches/javahl-1.7-extensions/subversion/mod_dav_svn/repos.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.7-extensions/subversion/mod_dav_svn/repos.c?rev=1507175&r1=1507174&r2=1507175&view=diff
==============================================================================
--- subversion/branches/javahl-1.7-extensions/subversion/mod_dav_svn/repos.c (original)
+++ subversion/branches/javahl-1.7-extensions/subversion/mod_dav_svn/repos.c Fri Jul 26 01:28:32 2013
@@ -2390,21 +2390,12 @@ get_parent_path(const char *path,
svn_boolean_t is_urlpath,
apr_pool_t *pool)
{
- apr_size_t len;
- char *tmp = apr_pstrdup(pool, path);
-
- len = strlen(tmp);
-
- if (len > 0)
+ if (*path != '\0') /* not an empty string */
{
- /* Remove any trailing slash; else svn_path_dirname() asserts. */
- if (tmp[len-1] == '/')
- tmp[len-1] = '\0';
-
if (is_urlpath)
- return svn_urlpath__dirname(tmp, pool);
+ return svn_urlpath__dirname(path, pool);
else
- return svn_fspath__dirname(tmp, pool);
+ return svn_fspath__dirname(path, pool);
}
return path;
@@ -2440,7 +2431,9 @@ get_parent_resource(const dav_resource *
parent->versioned = 1;
parent->hooks = resource->hooks;
parent->pool = resource->pool;
- parent->uri = get_parent_path(resource->uri, TRUE, resource->pool);
+ parent->uri = get_parent_path(svn_urlpath__canonicalize(resource->uri,
+ resource->pool),
+ TRUE, resource->pool);
parent->info = parentinfo;
parentinfo->uri_path =