Author: hwright
Date: Tue May 17 11:00:16 2011
New Revision: 1104127
URL: http://svn.apache.org/viewvc?rev=1104127&view=rev
Log:
Reintegate the 1.6.x-r917523 branch:
* r917523
If the configured slave url employes URI-unsafe characters
(<space>, '?', '%'), proxying of commits fails and commit affects
the slave repository directly.
Notes:
This backport depends on the r878590 and r916286 groups only for the
conflict free port. Alternatively, the back-port branch '1.6.x-r917523'
attempts to represent a dependency-free version of the same change.
Justification:
With this commit we avoid accidental commit to the slave and hence
making it unusable as a proxy anymore.
Branch:
^/subversion/branches/1.6.x-r917523
Votes:
+1: kameshj, cmpilato, gstein
Modified:
subversion/branches/1.6.x/ (props changed)
subversion/branches/1.6.x/STATUS
subversion/branches/1.6.x/subversion/mod_dav_svn/mirror.c
Propchange: subversion/branches/1.6.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 17 11:00:16 2011
@@ -67,6 +67,7 @@
/subversion/branches/1.6.x-r898963:899874-915098
/subversion/branches/1.6.x-r905326:905545-923537
/subversion/branches/1.6.x-r907644:1033292-1033692
+/subversion/branches/1.6.x-r917523:1035989-1104126
/subversion/branches/1.6.x-r923389:927445-929628
/subversion/branches/1.6.x-r926151:927922-929631
/subversion/branches/1.6.x-r933299:933310-934492
@@ -112,4 +113,4 @@
/subversion/branches/tc_url_rev:874351-874483
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
-/subversion/trunk:875965,875968,876004,876012,876017,876019,876022,876024,876032,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876104,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,876245,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614-876615,876628,876633,876641,876645,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877014,877016,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319,877407,877437,877441-877442,877453,87745
9,877472,877544,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877814-877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878447,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878910-878911,878915-878916,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148,879170,879198-879199,879201,879271,879293,879357,879375-879376,
879403,879631,879635-879636,879688,879709-879711,879747,879902,879916,879954,879961,879966,879971,880082,880095,880105,880146,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898048,898963,899826,899828,900797,901304,901752,902093,902467,904301,904394,904594,905303,905326,906256,906305,906587,907644,908980-908981,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,934599,934603,935631,935992,935996,937610,939375-939376,944635,945350,946355,946767,947006,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,964167,964349,964767,965405,965469,965508,979045,979429,980811,981449,981921,984565,984928,984931,991534,992114,996884,997026,997070,997457,997466,997471,997474,1000038,1000060,1000607,1000612,1001009,1002094,1005446,1022675,1024269,1027957
,1028108,1031165,1031186,1032808,1033166,1033290,1033665,1033685,1033921,1034557,1035745,1036534,1038792,1039040,1041438,1051632,1051638,1051733,1051744-1051745,1051751,1051761,1051763,1051775,1051778,1051968,1051978,1051988,1052029,1052041,1052068,1053185,1053208,1053233,1053499,1058269,1058722,1063870,1063946,1064839,1066249,1066270,1066276,1068988,1070912,1071239,1071307,1072084,1072953,1076759,1076826,1084575,1084581,1084962,1084978,1086222,1094692,1095654,1098608,1103665
+/subversion/trunk:875965,875968,876004,876012,876017,876019,876022,876024,876032,876041-876042,876048,876051,876055-876056,876059,876083,876091,876097,876101,876104,876109,876123-876125,876129,876132,876138,876160,876167,876175,876180,876185,876205,876223-876225,876230,876233,876245,876252,876256,876283,876287,876312,876326-876327,876330,876366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876614-876615,876628,876633,876641,876645,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,876857-876858,876862,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877014,877016,877028-877029,877038,877119,877127,877146,877157,877191,877195,877203,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319,877407,877437,877441-877442,877453,87745
9,877472,877544,877553,877565,877568,877573,877593,877595,877597,877601,877612,877665,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877814-877815,877819,877821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129,878131,878142,878173-878176,878216,878240,878242,878255,878269,878272,878279,878296-878297,878303,878321,878335,878338,878341,878343,878353,878364,878367-878368,878385,878399,878423,878426,878447,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878910-878911,878915-878916,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879093,879105,879126,879148,879170,879198-879199,879201,879271,879293,879357,879375-879376,
879403,879631,879635-879636,879688,879709-879711,879747,879902,879916,879954,879961,879966,879971,880082,880095,880105,880146,880162,880226,880274-880275,880370,880450,880461,880474,880525-880526,880552,881905,884842,886164,886197,888715,888979,889081,889840,891672,892050,892085,895514,895653,896522,896915,898048,898963,899826,899828,900797,901304,901752,902093,902467,904301,904394,904594,905303,905326,906256,906305,906587,907644,908980-908981,917523,917640,918211,922516,923389,923391,926151,926167,927323,927328,931209,931211,931392,931568,932942,933299,934599,934603,935631,935992,935996,937610,939375-939376,944635,945350,946355,946767,947006,948512,948916,949307,950931,950933,951753,952992,953317,955369,957507,958024,959004,959760,961055,961970,964167,964349,964767,965405,965469,965508,979045,979429,980811,981449,981921,984565,984928,984931,991534,992114,996884,997026,997070,997457,997466,997471,997474,1000038,1000060,1000607,1000612,1001009,1002094,1005446,1022675,1024269,
1027957,1028108,1031165,1031186,1032808,1033166,1033290,1033665,1033685,1033921,1034557,1035745,1036534,1038792,1039040,1041438,1051632,1051638,1051733,1051744-1051745,1051751,1051761,1051763,1051775,1051778,1051968,1051978,1051988,1052029,1052041,1052068,1053185,1053208,1053233,1053499,1058269,1058722,1063870,1063946,1064839,1066249,1066270,1066276,1068988,1070912,1071239,1071307,1072084,1072953,1076759,1076826,1084575,1084581,1084962,1084978,1086222,1094692,1095654,1098608,1103665
Modified: subversion/branches/1.6.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=1104127&r1=1104126&r2=1104127&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Tue May 17 11:00:16 2011
@@ -307,19 +307,3 @@ Approved changes:
justifications don't seem to refer to issue #3445. Please can we
separate these changes and clearly describe each one? And update
the r878607 log msg.)
-
- * r917523
- If the configured slave url employes URI-unsafe characters
- (<space>, '?', '%'), proxying of commits fails and commit affects
- the slave repository directly.
- Notes:
- This backport depends on the r878590 and r916286 groups only for the
- conflict free port. Alternatively, the back-port branch '1.6.x-r917523'
- attempts to represent a dependency-free version of the same change.
- Justification:
- With this commit we avoid accidental commit to the slave and hence
- making it unusable as a proxy anymore.
- Branch:
- ^/subversion/branches/1.6.x-r917523
- Votes:
- +1: kameshj, cmpilato, gstein
Modified: subversion/branches/1.6.x/subversion/mod_dav_svn/mirror.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/mod_dav_svn/mirror.c?rev=1104127&r1=1104126&r2=1104127&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/mod_dav_svn/mirror.c (original)
+++ subversion/branches/1.6.x/subversion/mod_dav_svn/mirror.c Tue May 17
11:00:16 2011
@@ -40,8 +40,10 @@ static void proxy_request_fixup(request_
r->proxyreq = PROXYREQ_REVERSE;
r->uri = r->unparsed_uri;
- r->filename = apr_pstrcat(r->pool, "proxy:", master_uri,
- uri_segment, NULL);
+ r->filename = (char *) svn_path_uri_encode(apr_pstrcat(r->pool, "proxy:",
+ master_uri,
+ uri_segment,
+ NULL), r->pool);
r->handler = "proxy-server";
ap_add_output_filter("LocationRewrite", NULL, r, r->connection);
ap_add_output_filter("ReposRewrite", NULL, r, r->connection);
@@ -74,7 +76,7 @@ int dav_svn__proxy_merge_fixup(request_r
of the repository isn't guaranteed to have on hand. */
if (r->method_number == M_PROPFIND ||
r->method_number == M_GET) {
- seg = ap_strstr(r->unparsed_uri, root_dir);
+ seg = ap_strstr(r->uri, root_dir);
if (seg && ap_strstr_c(seg,
apr_pstrcat(r->pool, special_uri,
"/wrk/", NULL))) {
@@ -87,7 +89,7 @@ int dav_svn__proxy_merge_fixup(request_r
/* If this is a write request aimed at a public URI (such as
MERGE, LOCK, UNLOCK, etc.) or any as-yet-unhandled request
using a "special URI", we have to doctor it a bit for proxying. */
- seg = ap_strstr(r->unparsed_uri, root_dir);
+ seg = ap_strstr(r->uri, root_dir);
if (seg && (r->method_number == M_MERGE ||
r->method_number == M_LOCK ||
r->method_number == M_UNLOCK ||
@@ -134,9 +136,11 @@ apr_status_t dav_svn__location_in_filter
ctx = f->ctx = apr_pcalloc(r->pool, sizeof(*ctx));
apr_uri_parse(r->pool, master_uri, &ctx->uri);
- ctx->remotepath = ctx->uri.path;
+ /* We are url encoding the current url and the master url
+ as incoming(from client) request body has it encoded already. */
+ ctx->remotepath = svn_path_uri_encode(ctx->uri.path, r->pool);
ctx->remotepath_len = strlen(ctx->remotepath);
- ctx->localpath = dav_svn__get_root_dir(r);
+ ctx->localpath = svn_path_uri_encode(dav_svn__get_root_dir(r),
r->pool);
ctx->localpath_len = strlen(ctx->localpath);
ctx->pattern = apr_strmatch_precompile(r->pool, ctx->localpath, 0);
ctx->pattern_len = ctx->localpath_len;
@@ -187,6 +191,7 @@ apr_status_t dav_svn__location_header_fi
const char *master_uri;
master_uri = dav_svn__get_master_uri(r);
+ master_uri = svn_path_uri_encode(master_uri, r->pool);
if (!r->main && master_uri) {
const char *location, *start_foo = NULL;
@@ -203,6 +208,7 @@ apr_status_t dav_svn__location_header_fi
dav_svn__get_root_dir(r),
start_foo, NULL),
r);
+ new_uri = svn_path_uri_encode(new_uri, r->pool);
apr_table_set(r->headers_out, "Location", new_uri);
}
}
@@ -229,9 +235,11 @@ apr_status_t dav_svn__location_body_filt
ctx = f->ctx = apr_pcalloc(r->pool, sizeof(*ctx));
apr_uri_parse(r->pool, master_uri, &ctx->uri);
- ctx->remotepath = ctx->uri.path;
+ /* We are url encoding the current url and the master url
+ as incoming (from master) request body has it encoded already. */
+ ctx->remotepath = svn_path_uri_encode(ctx->uri.path, r->pool);
ctx->remotepath_len = strlen(ctx->remotepath);
- ctx->localpath = dav_svn__get_root_dir(r);
+ ctx->localpath = svn_path_uri_encode(dav_svn__get_root_dir(r),
r->pool);
ctx->localpath_len = strlen(ctx->localpath);
ctx->pattern = apr_strmatch_precompile(r->pool, ctx->remotepath, 0);
ctx->pattern_len = ctx->remotepath_len;
