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

Re: svn commit: r38533 - trunk/subversion/mod_dav_svn

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: Tue, 04 Aug 2009 17:53:06 +0530

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

>
> apr_status_t dav_svn__location_body_filter(ap_filter_t *f,
> @@ -227,15 +237,26 @@ apr_status_t dav_svn__location_body_filt
> request_rec *r = f->r;
> locate_ctx_t *ctx = f->ctx;
> apr_bucket *bkt;
> - const char *master_uri;
> + const char *master_uri, *root_dir;
> + apr_uri_t uri;
>
> + /* Don't filter if we're in a subrequest or we aren't setup to
> + proxy anything. */
> master_uri = dav_svn__get_master_uri(r);
> -
> if (r->main || !master_uri) {
> ap_remove_output_filter(f);
> return ap_pass_brigade(f->next, bb);
> }
>
> + /* And don't filter if our search-n-replace would be a noop anyway
> + (that is, if our root path matches that of the master server). */
> + apr_uri_parse(r->pool, master_uri, &uri);
> + root_dir = dav_svn__get_root_dir(r);
> + if (strcmp(master_uri, root_dir) == 0) {
> + ap_remove_input_filter(f);

Here it should be ap_remove_output_filter, fixed in r38552.

With regards
Kamesh Jayachandran
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iD8DBQFKeCgq3WHvyO0YTCwRArgpAJ4j8wpktBy1ISSZK8ePNkj7rmVe3wCdFf8o
GFo3CKVLpGvfTTIgRYf9HxM=
=aXaU
-----END PGP SIGNATURE-----

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2379975
Received on 2009-08-04 14:23:44 CEST

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