Author: svn-role
Date: Thu Aug 8 04:00:33 2013
New Revision: 1511569
URL: http://svn.apache.org/r1511569
Log:
Merge the 1.7.x-r1507044 branch:
* r1507044
Fix a bug in the Perl bindings.
Branch: ^/subversion/branches/1.7.x-r1507044
Justification: The bug makes scripts using SVN::Client look like
as if they didn't honor config settings from ~/.subversion/servers,
though they should by default.
Votes:
+1: rschupp, danielsh
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/branches/1.7.x-r1507044:r1507300-1511568
Merged /subversion/trunk:r1507044
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1511569&r1=1511568&r2=1511569&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Thu Aug 8 04:00:33 2013
@@ -191,12 +191,3 @@ Veto-blocked changes:
Approved changes:
=================
- * r1507044
- Fix a bug in the Perl bindings.
- Branch: ^/subversion/branches/1.7.x-r1507044
- Justification: The bug makes scripts using SVN::Client look like
- as if they didn't honor config settings from ~/.subversion/servers,
- though they should by default.
- Votes:
- +1: rschupp, danielsh
-
Modified:
subversion/branches/1.7.x/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c?rev=1511569&r1=1511568&r2=1511569&view=diff
==============================================================================
---
subversion/branches/1.7.x/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
(original)
+++
subversion/branches/1.7.x/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
Thu Aug 8 04:00:33 2013
@@ -114,9 +114,9 @@ static apr_hash_t *svn_swig_pl_to_hash(S
h = (HV *)SvRV(source);
cnt = hv_iterinit(h);
while (cnt--) {
- SV* item = hv_iternextsv(h, &key, &retlen);
- void *val = cv(item, ctx, pool);
- apr_hash_set(hash, key, APR_HASH_KEY_STRING, val);
+ SV* item = hv_iternextsv(h, &key, &retlen);
+ void *val = cv(item, ctx, pool);
+ apr_hash_set(hash, apr_pstrmemdup(pool, key, retlen), retlen, val);
}
return hash;
