Bill Stoddard [Sun, 3 Feb 2002 06:11:40 +0000 (06:11 +0000)]
First cut at mod_disk_cache, based on code from the IBM AS400 team. Still
need to cleanup where some bytes are stored, check-in routines this module
calls in cache_util, etc.
Cliff Woolley [Sun, 3 Feb 2002 03:19:41 +0000 (03:19 +0000)]
I was leaning toward the configurable flavor, but OtherBill convinced me
we should be more concerned with keeping the parent rock solid than adding
extra layers to protect the children from a broken parent.
Linux 2.4 (MDK 8.0) is fine here as reported earlier.
I'm fine with adjusting that script in a -beta tarball since it isn't a
code change. However, since official binbuilds are contributed by
committers only, this isn't a big deal as they can be smart enough to
use the updated script anyway. And, binbuild has some other issues that
will be addressed shortly. So, even if it doesn't happen, oh well.
- Add note about EBCDIC.
- ap_[r]getline rewrite has landed. I think it is time for this STATUS
item to be removed. Is there anything more w.r.t. input filtering
that needs to be addressed?
Jeff Trawick [Fri, 1 Feb 2002 22:08:34 +0000 (22:08 +0000)]
mod_cgid: Add retry logic for when the daemon can't fork fast
enough to keep up with new requests. Start using
HTTP_SERVER_UNAVAILABLE instead of HTTP_INTERNAL_SERVER_ERROR
when we can't talk to the daemon.
Moved the #endif of APR_HAS_SHARED_MEMORY to include a reference
to the global variable ap_scoreboard_shm. Since this variable was already
being excluded by APR_HAS_SHARED_MEMORY at the beginning of the
file.
There are really two issues here:
- Can we *ever* build a static binary? That *is* a showstopper, I agree.
And, Aaron has volunteered to fix this soon-ish.
- Separate from that, is the question whether we should we *always* build a
static binary? That I do not believe I *is* a showstopper. So, let's
make the distinction and call for a vote.
Greg Ames [Thu, 31 Jan 2002 19:54:53 +0000 (19:54 +0000)]
fix redirects for directories. fixup_dir was munging the URI before other
fixup hooks (such as fixup_redir in mod_alias) had a chance to redirect
the original directory URI.
Bradley Nicholes [Thu, 31 Jan 2002 19:21:34 +0000 (19:21 +0000)]
Removed the call for now to shutdown the listeners so that threads don't end
up stuck on blocking socket calls during shutdown. I need to figure out a
cleaner way of preventing this problem.
Martin Kraemer [Thu, 31 Jan 2002 14:48:51 +0000 (14:48 +0000)]
Add MDTM support if supported by the FTP server, and if either
timegm() exists or struct tm has a tm_gmtoff field (needed for
easily converting the time string to a GMT timestamp).
Escaping for ftp path arguments now uses a dedicated escaping
routine (in order to only escape globbing characters, not all
shell meta characters).
Execute the SIZE query with the same TYPE setting as the RETR transfer,
because the SIZE may be calculated differently for ASCII files.
The missing xcopy's <.a bit was a showstopper, but to ensure any win32
command.com/cmd.exe lives with us, add the <.y for all copy commands
where the file could already exist.
Martin Kraemer [Wed, 30 Jan 2002 22:41:59 +0000 (22:41 +0000)]
Eliminate variables where unneeded; move ";type=" checking code to front;
drop redundant log messages (covered by proxy_ftp_command());
do checks for /%2f as in apache-1.3.24;
escape path argument in SIZE command
Ryan Bloom [Wed, 30 Jan 2002 22:35:57 +0000 (22:35 +0000)]
Change the Windows MPM to only use the pre_mpm phase in the parent process.
The child processes use the child_init phase to reattach to the shared
memory. This makes Windows work like Unix, which should make it easier
for module authors to write portable modules.
Martin Kraemer [Wed, 30 Jan 2002 15:12:57 +0000 (15:12 +0000)]
Describe the proxy_ftp changes:
FTP directory listings are now always retrieved in ASCII mode.
The FTP proxy properly escapes URI's and HTML in the generated
listing, and escapes the path components when talking to the FTP
server. It is now possible to browse the root directory by using
a url like: ftp://user@host/%2f/ (ported from apache_1.3.24)
Also, the last path component may contain wildcard characters
'*' and '?', and if they do, a directory listing is created instead
of a file retrieval. Example: ftp://user@host/httpd/server/*.c
Martin Kraemer [Wed, 30 Jan 2002 15:07:48 +0000 (15:07 +0000)]
Port the "squid %2f hack" from apache_1.3.24.
It is now possible to browse the root directory by using a url
like: ftp://user@host/%2f/
Also, the last path component may contain wildcard characters
'*' and '?', and if they do, a directory listing is created instead
of a file retrieval. Example: ftp://user@host/httpd/server/*.c
Martin Kraemer [Wed, 30 Jan 2002 14:54:18 +0000 (14:54 +0000)]
For the ftp commands CWD and RETR, do escaping for the path elements,
because FTP servers do globbing, which we do not want for filenames
from the directory listing.
PR:
Obtained from:
Submitted by:
Reviewed by:
Martin Kraemer [Wed, 30 Jan 2002 09:47:22 +0000 (09:47 +0000)]
Simplify the complexity by using a common proxy_ftp_command() routine.
Strip the ";type=X" suffix from the header generated in dir listings.
Set type to ASCII for directory listings. Use common get_PWD() routine.
Brian Pane [Wed, 30 Jan 2002 06:33:18 +0000 (06:33 +0000)]
Added logic to the worker MPM to skip the poll before accept
if there's only one listener socket (based on the implementation
in the prefork MPM). This also enables us to do single-listener
unserialized accept
Simplify the exit paths of ap_rgetline by creating a second brigade for
use when we do AP_MODE_SPECULATIVE. This allows us to delete the
brigades earlier.
(In practice, it really doesn't matter if we delete the brigade or not
since it will be destroyed when it's pool is destroyed, but we'll try
to be nice.)
Bill Stoddard [Tue, 29 Jan 2002 19:02:04 +0000 (19:02 +0000)]
This patch restores most of Ryan's patch (11/12/2001) to remove the
client_socket from the conn_rec. Diffs from Ryan's patch include:
- rename the create_connection hook to install_transport_filters
- move the point of invocation of the hook till after the call to
after ap_update_vhost_given_ip to enable the hook to use vhost
config info in its decision making.
BuildBin never made it to this home. Makefile.win got lost, since it
would have been invoked from another path, trying to validate that the
apr and apr-util repositories had been checked out. Too much trouble :)
By popular demand and some of my own observations - here is a build
target one can use as a dummy, without 'installing binaries'. Now
Win32's makefile.win will simply kick off BuildBin and let it fire
off all the targets from a command line build. This will help to
resolve some of the misses on incremental builds.
Martin Kraemer [Tue, 29 Jan 2002 17:56:42 +0000 (17:56 +0000)]
If the ftp proxy could not guess the output format of the ftp server's
directory listing, it makes another attempt: it tries a format similar to
the output of "ls -s1" (optional whitespace followed by size, followed by
whitespace, followed by filename, where filename may contain no more whitespace).
This format works at least with one FTP server for which previously only
the (non-clickable) output was displayed.
Martin Kraemer [Tue, 29 Jan 2002 17:07:26 +0000 (17:07 +0000)]
Fix handling of \r\n at the end of FTP directory listings (\r characters
were left in the output and would create additional line breaks in most
browsers)