[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] Why bother about r->main in webdav write through proxy code?

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: Wed, 18 Mar 2009 21:16:01 +0530

Hi All,

I was going through the webdav write through proxy filter code.
I could see check for 'r->main' in it.

I tested the following,
1. slave writing to different master host.
2. slave writing to same master host instance but on a different uri.

In both tests I could 'r->main' is always null.

I am not sure why we should bother about sub request inside by checking
for r->main?

Attached patch removes such checks.

Any thoughts?

With regards
Kamesh Jayachandran

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1349115

Why bother about r->main in write through proxy?

* subversion/mod_dav_svn/mirror.c
  (dav_svn__location_in_filter,
   dav_svn__location_header_filter,
   dav_svn__location_body_filter): Do not bother about r->main.

Index: subversion/mod_dav_svn/mirror.c
===================================================================
--- subversion/mod_dav_svn/mirror.c (revision 36651)
+++ subversion/mod_dav_svn/mirror.c (working copy)
@@ -125,7 +125,7 @@
 
     master_uri = dav_svn__get_master_uri(r);
 
- if (r->main || !master_uri) {
+ if (!master_uri) {
         ap_remove_input_filter(f);
         return ap_get_brigade(f->next, bb, mode, block, readbytes);
     }
@@ -188,7 +188,7 @@
 
     master_uri = dav_svn__get_master_uri(r);
 
- if (!r->main && master_uri) {
+ if (master_uri) {
         const char *location, *start_foo = NULL;
 
         location = apr_table_get(r->headers_out, "Location");
@@ -220,7 +220,7 @@
 
     master_uri = dav_svn__get_master_uri(r);
 
- if (r->main || !master_uri) {
+ if (!master_uri) {
         ap_remove_output_filter(f);
         return ap_pass_brigade(f->next, bb);
     }

Received on 2009-03-18 16:45:08 CET

This is an archived mail posted to the Subversion Dev mailing list.