You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/07/22 20:37:01 UTC
svn commit: r1149686 - in /subversion/branches/1.7.x: ./
subversion/include/private/ subversion/libsvn_subr/ subversion/mod_dav_svn/
subversion/tests/libsvn_wc/
Author: hwright
Date: Fri Jul 22 18:37:00 2011
New Revision: 1149686
URL: http://svn.apache.org/viewvc?rev=1149686&view=rev
Log:
Merge r1149240 from trunk:
* r1149240
Support APR 0.9.
Justification:
We still claim to support it.
Votes:
+1: philip, rhuijben, hwright
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/include/private/svn_dep_compat.h
subversion/branches/1.7.x/subversion/include/private/svn_string_private.h (contents, props changed)
subversion/branches/1.7.x/subversion/libsvn_subr/svn_string.c
subversion/branches/1.7.x/subversion/mod_dav_svn/util.c
subversion/branches/1.7.x/subversion/tests/libsvn_wc/op-depth-test.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 22 18:37:00 2011
@@ -54,4 +54,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1149686&r1=1149685&r2=1149686&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Jul 22 18:37:00 2011
@@ -128,13 +128,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1149240
- Support APR 0.9.
- Justification:
- We still claim to support it.
- Votes:
- +1: philip, rhuijben, hwright
-
* r1149572
Fix mod_authz_svn SEGV with AuthzForceUsernameCase and no authentication.
Justification:
Modified: subversion/branches/1.7.x/subversion/include/private/svn_dep_compat.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/include/private/svn_dep_compat.h?rev=1149686&r1=1149685&r2=1149686&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/include/private/svn_dep_compat.h (original)
+++ subversion/branches/1.7.x/subversion/include/private/svn_dep_compat.h Fri Jul 22 18:37:00 2011
@@ -62,6 +62,11 @@ extern "C" {
#define apr_array_clear(arr) (arr)->nelts = 0
#endif
+#if !APR_VERSION_AT_LEAST(1,0,0)
+#define APR_UINT64_C(val) UINT64_C(val)
+#define APR_FPROT_OS_DEFAULT APR_OS_DEFAULT
+#endif
+
#if !APR_VERSION_AT_LEAST(1,3,0)
#define APR_UINT16_MAX 0xFFFFU
#define APR_INT16_MAX 0x7FFF
Modified: subversion/branches/1.7.x/subversion/include/private/svn_string_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/include/private/svn_string_private.h?rev=1149686&r1=1149685&r2=1149686&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/include/private/svn_string_private.h (original)
+++ subversion/branches/1.7.x/subversion/include/private/svn_string_private.h Fri Jul 22 18:37:00 2011
@@ -53,6 +53,11 @@ extern "C" {
*/
svn_string_t *
svn_stringbuf__morph_into_string(svn_stringbuf_t *strbuf);
+
+/** Like apr_strtoff but provided here for backward compatibility
+ * with APR 0.9 */
+apr_status_t
+svn__strtoff(apr_off_t *offset, const char *buf, char **end, int base);
/** @} */
/** @} */
Propchange: subversion/branches/1.7.x/subversion/include/private/svn_string_private.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 22 18:37:00 2011
@@ -53,3 +53,4 @@
/subversion/branches/tree-conflicts/subversion/include/svn_string.h:868291-873154
/subversion/branches/tree-conflicts-notify/subversion/include/svn_string.h:873926-874008
/subversion/branches/uris-as-urls/subversion/include/svn_string.h:1060426-1064427
+/subversion/trunk/subversion/include/private/svn_string_private.h:1149240
Modified: subversion/branches/1.7.x/subversion/libsvn_subr/svn_string.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_subr/svn_string.c?rev=1149686&r1=1149685&r2=1149686&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_subr/svn_string.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_subr/svn_string.c Fri Jul 22 18:37:00 2011
@@ -839,3 +839,16 @@ svn_cstring_atoi(int *n, const char *str
*n = (int)val;
return SVN_NO_ERROR;
}
+
+
+apr_status_t
+svn__strtoff(apr_off_t *offset, const char *buf, char **end, int base)
+{
+#if !APR_VERSION_AT_LEAST(1,0,0)
+ errno = 0;
+ *offset = strtol(buf, end, base);
+ return APR_FROM_OS_ERROR(errno);
+#else
+ return apr_strtoff(offset, buf, end, base);
+#endif
+}
Modified: subversion/branches/1.7.x/subversion/mod_dav_svn/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/mod_dav_svn/util.c?rev=1149686&r1=1149685&r2=1149686&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/mod_dav_svn/util.c (original)
+++ subversion/branches/1.7.x/subversion/mod_dav_svn/util.c Fri Jul 22 18:37:00 2011
@@ -37,6 +37,7 @@
#include "dav_svn.h"
#include "private/svn_fspath.h"
+#include "private/svn_string_private.h"
dav_error *
dav_svn__new_error(apr_pool_t *pool,
@@ -678,7 +679,7 @@ request_body_to_string(svn_string_t **re
content_length_str = apr_table_get(r->headers_in, "Content-Length");
if (content_length_str)
{
- if (apr_strtoff(&content_length, content_length_str, &endp, 10)
+ if (svn__strtoff(&content_length, content_length_str, &endp, 10)
|| endp == content_length_str || *endp || content_length < 0)
{
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "Invalid Content-Length");
Modified: subversion/branches/1.7.x/subversion/tests/libsvn_wc/op-depth-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/tests/libsvn_wc/op-depth-test.c?rev=1149686&r1=1149685&r2=1149686&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/branches/1.7.x/subversion/tests/libsvn_wc/op-depth-test.c Fri Jul 22 18:37:00 2011
@@ -40,6 +40,7 @@
#include "private/svn_wc_private.h"
#include "private/svn_sqlite.h"
+#include "private/svn_dep_compat.h"
#include "../../libsvn_wc/wc.h"
#include "../../libsvn_wc/wc_db.h"
#define SVN_WC__I_AM_WC_DB