You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2013/12/28 17:25:35 UTC
svn commit: r1553868 - in /subversion/trunk/subversion/mod_dav_svn/reports:
file-revs.c get-location-segments.c get-locations.c inherited-props.c log.c
mergeinfo.c
Author: rhuijben
Date: Sat Dec 28 16:25:35 2013
New Revision: 1553868
URL: http://svn.apache.org/r1553868
Log:
In mod_dav_svn remove some unneeded wrapping of error messages with the
error message itself. This also fixes a possible pool lifetime issue on
these messages.
* subversion/mod_dav_svn/reports/file-revs.c
(dav_svn__file_revs_report):
* subversion/mod_dav_svn/reports/get-location-segments.c
(dav_svn__get_location_segments_report):
* subversion/mod_dav_svn/reports/get-locations.c
(dav_svn__get_locations_report):
* subversion/mod_dav_svn/reports/inherited-props.c
(dav_svn__get_inherited_props_report):
* subversion/mod_dav_svn/reports/log.c
(dav_svn__log_report):
* subversion/mod_dav_svn/reports/mergeinfo.c
(dav_svn__get_mergeinfo_report): Don't wrap messages with err->message. This
makes the conversion do extra work and the message may not even live until
the message is printed as the error is cleared before that.
Modified:
subversion/trunk/subversion/mod_dav_svn/reports/file-revs.c
subversion/trunk/subversion/mod_dav_svn/reports/get-location-segments.c
subversion/trunk/subversion/mod_dav_svn/reports/get-locations.c
subversion/trunk/subversion/mod_dav_svn/reports/inherited-props.c
subversion/trunk/subversion/mod_dav_svn/reports/log.c
subversion/trunk/subversion/mod_dav_svn/reports/mergeinfo.c
Modified: subversion/trunk/subversion/mod_dav_svn/reports/file-revs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/reports/file-revs.c?rev=1553868&r1=1553867&r2=1553868&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/reports/file-revs.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/reports/file-revs.c Sat Dec 28 16:25:35 2013
@@ -324,7 +324,7 @@ dav_svn__file_revs_report(const dav_reso
right then, so r->status remains 0, hence HTTP status 200
would be misleadingly returned. */
return (dav_svn__convert_err(serr, HTTP_INTERNAL_SERVER_ERROR,
- serr->message, resource->pool));
+ NULL, resource->pool));
}
if ((serr = maybe_send_header(&frb)))
Modified: subversion/trunk/subversion/mod_dav_svn/reports/get-location-segments.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/reports/get-location-segments.c?rev=1553868&r1=1553867&r2=1553868&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/reports/get-location-segments.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/reports/get-location-segments.c Sat Dec 28 16:25:35 2013
@@ -206,7 +206,7 @@ dav_svn__get_location_segments_report(co
dav_svn__authz_read_func(&arb),
&arb, resource->pool)))
{
- derr = dav_svn__convert_err(serr, HTTP_BAD_REQUEST, serr->message,
+ derr = dav_svn__convert_err(serr, HTTP_BAD_REQUEST, NULL,
resource->pool);
goto cleanup;
}
Modified: subversion/trunk/subversion/mod_dav_svn/reports/get-locations.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/reports/get-locations.c?rev=1553868&r1=1553867&r2=1553868&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/reports/get-locations.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/reports/get-locations.c Sat Dec 28 16:25:35 2013
@@ -164,8 +164,8 @@ dav_svn__get_locations_report(const dav_
if (serr)
{
- return dav_svn__convert_err(serr, HTTP_INTERNAL_SERVER_ERROR,
- serr->message, resource->pool);
+ return dav_svn__convert_err(serr, HTTP_INTERNAL_SERVER_ERROR, NULL,
+ resource->pool);
}
bb = apr_brigade_create(resource->pool, output->c->bucket_alloc);
Modified: subversion/trunk/subversion/mod_dav_svn/reports/inherited-props.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/reports/inherited-props.c?rev=1553868&r1=1553867&r2=1553868&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/reports/inherited-props.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/reports/inherited-props.c Sat Dec 28 16:25:35 2013
@@ -116,7 +116,7 @@ dav_svn__get_inherited_props_report(cons
&arb, resource->pool, iterpool);
if (serr)
{
- derr = dav_svn__convert_err(serr, HTTP_BAD_REQUEST, serr->message,
+ derr = dav_svn__convert_err(serr, HTTP_BAD_REQUEST, NULL,
resource->pool);
goto cleanup;
}
@@ -128,7 +128,7 @@ dav_svn__get_inherited_props_report(cons
"xmlns:D=\"DAV:\">" DEBUG_CR);
if (serr)
{
- derr = dav_svn__convert_err(serr, HTTP_BAD_REQUEST, serr->message,
+ derr = dav_svn__convert_err(serr, HTTP_BAD_REQUEST, NULL,
resource->pool);
goto cleanup;
}
Modified: subversion/trunk/subversion/mod_dav_svn/reports/log.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/reports/log.c?rev=1553868&r1=1553867&r2=1553868&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/reports/log.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/reports/log.c Sat Dec 28 16:25:35 2013
@@ -474,7 +474,7 @@ dav_svn__log_report(const dav_resource *
resource->pool);
if (serr)
{
- derr = dav_svn__convert_err(serr, HTTP_BAD_REQUEST, serr->message,
+ derr = dav_svn__convert_err(serr, HTTP_BAD_REQUEST, NULL,
resource->pool);
goto cleanup;
}
Modified: subversion/trunk/subversion/mod_dav_svn/reports/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/reports/mergeinfo.c?rev=1553868&r1=1553867&r2=1553868&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/reports/mergeinfo.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/reports/mergeinfo.c Sat Dec 28 16:25:35 2013
@@ -129,7 +129,7 @@ dav_svn__get_mergeinfo_report(const dav_
&arb, resource->pool);
if (serr)
{
- derr = dav_svn__convert_err(serr, HTTP_BAD_REQUEST, serr->message,
+ derr = dav_svn__convert_err(serr, HTTP_BAD_REQUEST, NULL,
resource->pool);
goto cleanup;
}
@@ -139,7 +139,7 @@ dav_svn__get_mergeinfo_report(const dav_
resource->pool);
if (serr)
{
- derr = dav_svn__convert_err(serr, HTTP_BAD_REQUEST, serr->message,
+ derr = dav_svn__convert_err(serr, HTTP_BAD_REQUEST, NULL,
resource->pool);
goto cleanup;
}
@@ -157,7 +157,7 @@ dav_svn__get_mergeinfo_report(const dav_
"xmlns:D=\"DAV:\">" DEBUG_CR);
if (serr)
{
- derr = dav_svn__convert_err(serr, HTTP_BAD_REQUEST, serr->message,
+ derr = dav_svn__convert_err(serr, HTTP_BAD_REQUEST, NULL,
resource->pool);
goto cleanup;
}