You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Michael Parker <pa...@jump.net> on 2001/08/21 02:46:21 UTC

[PATCH] apr_uri_parse_components name change

Here is another patch to fix the recent renaming of the
apr_uri_*_components stuffs by Doug in apr-util.  Without this I get
an undefined symbol error from Apache on startup.


Index: subversion/mod_dav_svn/util.c
===================================================================
RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/mod_dav_svn/util.c,v
retrieving revision 1.17
diff -u -p -r1.17 util.c
--- subversion/mod_dav_svn/util.c       2001/08/20 20:12:17     1.17
+++ subversion/mod_dav_svn/util.c       2001/08/21 02:40:09
@@ -94,7 +94,7 @@ svn_error_t *dav_svn_simple_parse_uri(da
   const char *slash;
 
   /* parse the input URI, in case it is more than just a path */
-  if (apr_uri_parse_components(pool, uri, &comp) != APR_SUCCESS)
+  if (apr_uri_parse(pool, uri, &comp) != APR_SUCCESS)
     goto malformed_uri;
 
   /* ### ignore all URI parts but the path (for now) */


Michael

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: [PATCH] apr_uri_parse_components name change

Posted by "C. Scott Ananian" <ca...@lesser-magoo.lcs.mit.edu>.
On 21 Aug 2001 kfogel@collab.net wrote:

> Thanks for the follow-up patch, Michael.  I should have noticed this
> (or tested by doing an Apache startup) when I applied the original
> `apr_uri_t' patch from C. Scott Ananian.

I could have noticed it, but for the fact that I didn't actually set up
apache webdav with svn yet. =)
  --s

IDEA Waco, Texas Noriega Washington Soviet  Leitrim Legion of Doom 
anthrax D5 SLBM MI6 AES President mustard AK-47 Indonesia explosives 
              ( http://lesser-magoo.lcs.mit.edu/~cananian )
 --
 "These students are going to have to find out what law and order is
 all about."  -- Brig. General Robert Canterbury, Noon, May 4, 1970,
 minutes before his troops shot 13 unarmed Kent State students, killing 4.
 --
            [http://www.cs.cmu.edu/~dst/DeCSS/Gallery/]
#!/usr/bin/perl -w
# 526-byte qrpff, Keith Winstein and Marc Horowitz <si...@mit.edu>
# MPEG 2 PS VOB file on stdin -> descrambled output on stdout
# arguments: title key bytes in least to most-significant order
$_='while(read+STDIN,$_,2048){$a=29;$c=142;if((@a=unx"C*",$_)[20]&48){$h=5;
$_=unxb24,join"",@b=map{xB8,unxb8,chr($_^$a[--$h+84])}@ARGV;s/...$/1$&/;$d=
unxV,xb25,$_;$b=73;$e=256|(ord$b[4])<<9|ord$b[3];$d=$d>>8^($f=($t=255)&($d
>>12^$d>>4^$d^$d/8))<<17,$e=$e>>8^($t&($g=($q=$e>>14&7^$e)^$q*8^$q<<6))<<9
,$_=(map{$_%16or$t^=$c^=($m=(11,10,116,100,11,122,20,100)[$_/16%8])&110;$t
^=(72,@z=(64,72,$a^=12*($_%16-2?0:$m&17)),$b^=$_%64?12:0,@z)[$_%8]}(16..271))
[$_]^(($h>>=8)+=$f+(~$g&$t))for@a[128..$#a]}print+x"C*",@a}';s/x/pack+/g;eval


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: [PATCH] apr_uri_parse_components name change

Posted by kf...@collab.net.
Michael Parker <pa...@jump.net> writes:
> Here is another patch to fix the recent renaming of the
> apr_uri_*_components stuffs by Doug in apr-util.  Without this I get
> an undefined symbol error from Apache on startup.

Thanks for the follow-up patch, Michael.  I should have noticed this
(or tested by doing an Apache startup) when I applied the original
`apr_uri_t' patch from C. Scott Ananian.

-K



> Index: subversion/mod_dav_svn/util.c
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/subversion/mod_dav_svn/util.c,v
> retrieving revision 1.17
> diff -u -p -r1.17 util.c
> --- subversion/mod_dav_svn/util.c       2001/08/20 20:12:17     1.17
> +++ subversion/mod_dav_svn/util.c       2001/08/21 02:40:09
> @@ -94,7 +94,7 @@ svn_error_t *dav_svn_simple_parse_uri(da
>    const char *slash;
>  
>    /* parse the input URI, in case it is more than just a path */
> -  if (apr_uri_parse_components(pool, uri, &comp) != APR_SUCCESS)
> +  if (apr_uri_parse(pool, uri, &comp) != APR_SUCCESS)
>      goto malformed_uri;
>  
>    /* ### ignore all URI parts but the path (for now) */
> 
> 
> Michael
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org