httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jim Jagielski <...@jaguNET.com>
Subject Re: mod_ftp leftover glob() garbage?
Date Sat, 08 Dec 2007 18:05:59 GMT
Currently, these are no longer required... thanks for
the check :)

On Dec 5, 2007, at 2:48 PM, William A. Rowe, Jr. wrote:

> Jim especially,
>
> Attached is what I believe are checks that were only relevant to
> the existence of the glob() functionality.  Now that we are doing
> an apr_fnmatch, they seem obsolete and should just be chucked
> (although the patch simply marks them out for verification.
>
> Could you please review if these were actually still relevant?
>
> Bill
>
> Index: modules/ftp/ftp_util.c
> ===================================================================
> --- modules/ftp/ftp_util.c	(revision 600646)
> +++ modules/ftp/ftp_util.c	(working copy)
> @@ -189,6 +189,7 @@
>
>      rr = ap_sub_req_lookup_file(name, r, NULL);
>
> +#if FTP_HAS_GLOB
>      /* Another hack.  With BSD glob it is possible to return a file
>       * outside the current directory. (or document root for that  
> matter).
>       * This was an oversight made when adding the GLOB_NOPERIOD  
> option
> @@ -197,12 +198,16 @@
>       */
>      ap_parse_uri(rr, name);
>      ap_getparents(rr->uri);
> +#endif
>
>      if ((rr->finfo.filetype != 0) &&
>          ((rr->status == HTTP_OK) || (rr->status ==  
> HTTP_MOVED_PERMANENTLY) ||
>           (rr->status == HTTP_UNAUTHORIZED &&
> -          fsc->options & FTP_OPT_SHOWUNAUTH)) &&
> -        (rr->uri != NULL))
> +          fsc->options & FTP_OPT_SHOWUNAUTH))
> +#if FTP_HAS_GLOB
> +        && (rr->uri != NULL)
> +#endif
> +       )
>      {
>          apr_time_exp_t xt;
>          apr_size_t retcode;


Mime
View raw message