1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-26 19:01:35 +03:00
Commit Graph

2909 Commits

Author SHA1 Message Date
Brian Pane
8d637c1f13 Performance fixes:
* eliminate some copying of sub-parts of the content type in analyze_ct()
* take advantage of the fact that we know the lengths of those sub-parts
  in find_ct() to avoid having to recompute their length for concatenation

The charset handling code needs the same type of optimization eventually.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94900 13f79535-47bb-0310-9956-ffa450edef68
2002-05-02 03:19:44 +00:00
Paul J. Reder
4a243a466e Fix a case where an invalid pass phrase is entered and an
error message is given, but the prompt is not shown again.
This left the user in an ambiguous state.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94896 13f79535-47bb-0310-9956-ffa450edef68
2002-05-01 19:28:52 +00:00
Bradley Nicholes
319d1c81de NetWare make files for building experimental module mod_cache and its
associated support modules.

Submitted by: Jean-Jacques Clar [jjclar@novell.com]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94884 13f79535-47bb-0310-9956-ffa450edef68
2002-04-30 22:16:51 +00:00
Bradley Nicholes
60934d2ca2 NetWare make files for building experimental modules mod_deflate,
mod_example and support utilities ab, htdbm and logresolve

Submitted by: Guenter Knauf [eflash@gmx.net]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94883 13f79535-47bb-0310-9956-ffa450edef68
2002-04-30 21:54:53 +00:00
Cliff Woolley
a412db08b2 Revert optimization from circa 2.0.34 that caused very long vhost id's
to be unusable with mod_ssl.

PR: 8572


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94881 13f79535-47bb-0310-9956-ffa450edef68
2002-04-30 17:10:12 +00:00
Cliff Woolley
878296f383 note a desirable goal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94877 13f79535-47bb-0310-9956-ffa450edef68
2002-04-30 06:57:22 +00:00
Cliff Woolley
4a0447cf13 SHMCB should not have been using apr_rmm -- it was doing so incorrectly,
for one thing.  But it just plain doesn't need it.  Rip it out to avoid
segfaulting.

Submitted by:  Aaron Bannert


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94876 13f79535-47bb-0310-9956-ffa450edef68
2002-04-30 06:48:45 +00:00
Cliff Woolley
0db4d51f74 - Sync with modssl 2.8.8-1.3.24
- Also a minor change to add more useful error
  logging for shmcb startup failures


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94875 13f79535-47bb-0310-9956-ffa450edef68
2002-04-30 03:47:31 +00:00
Bill Stoddard
47f300e86b Enable mod_mem_cache to be configured to cache open file handle using new
directive option: CacheEnable fd / will enable caching fds. If for some
reason the fd cannot be cached, the directive will effectively morph into
CacheEnable mem /


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94873 13f79535-47bb-0310-9956-ffa450edef68
2002-04-30 03:25:12 +00:00
Bill Stoddard
3e32f7de9a remove_entity should only work on complete cache_objects
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94871 13f79535-47bb-0310-9956-ffa450edef68
2002-04-30 00:06:16 +00:00
Bill Stoddard
be5f867774 Forget to update the error messages
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94867 13f79535-47bb-0310-9956-ffa450edef68
2002-04-29 19:44:47 +00:00
Bill Stoddard
aa750945c8 Name space protect mod_mem_cache config directives
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94866 13f79535-47bb-0310-9956-ffa450edef68
2002-04-29 19:09:20 +00:00
Bradley Nicholes
f03539bbd4 Added some missing export to the proxy module
Submitted by: Guenter Knauf


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94862 13f79535-47bb-0310-9956-ffa450edef68
2002-04-29 14:35:48 +00:00
Brian Pane
4c04f98079 Replaced a sprintf("%d") with itoa
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94856 13f79535-47bb-0310-9956-ffa450edef68
2002-04-29 08:05:37 +00:00
Brian Pane
da008d4724 Short-circuit out of mod_userdir's translation handler faster on
non "/~*" requests


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94855 13f79535-47bb-0310-9956-ffa450edef68
2002-04-29 07:45:43 +00:00
Bill Stoddard
05097b8910 Fix spelling/typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94851 13f79535-47bb-0310-9956-ffa450edef68
2002-04-29 02:36:10 +00:00
Brian Pane
6d523a8f2c Because mod_imap's handler runs on every request in the default
configuration, rearrange the code to keep it from allocating a few
pages worth of local variables on the stack on requests that don't
use imagemaps


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94849 13f79535-47bb-0310-9956-ffa450edef68
2002-04-29 01:03:17 +00:00
Roy T. Fielding
108504ab8b kill a warning on Darwin for NONCE_LEN becoming a long int by math.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94833 13f79535-47bb-0310-9956-ffa450edef68
2002-04-28 09:02:19 +00:00
Justin Erenkrantz
d8b443e424 If a subreq added a filter (say INCLUDES) and the subreq was promoted via
fast_redirect, the filter would still point at the subreq - rather than
the original r.  So, we must update any filters pointing at rr to be r.

This would cause lots of problems with mod_include with mod_dir requests
such as seen in PR 7966.  mod_include would be unsetting the headers_out
of rr instead of r.  But, we disassociate rr->headers_out and r->headers_out.
Therefore, the C-L header in r->headers_out would remain - even though it
bears no relation to what we will be outputting - causing problems.

This also now permits chunked-encoding of mod_dir/mod_include requests
which could never happen before and fixes the content-length problem
seen in PR 7966.

As hinted at in PR 7966, there is a race condition - if for some reason
the server stalls reading an included file (or even better, placing a
sleep in the cgi-bin script!), the invalid C-L may get propogated to the
client.

(Note that internal_internal_redirect has this same code fragment.)

PR: 7966


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94832 13f79535-47bb-0310-9956-ffa450edef68
2002-04-28 06:41:35 +00:00
William A. Rowe Jr
e712670527 After review and testing against all of the PSDK examples (see
http://www.apache.org/~wrowe/ for commentary on building the
  examples and making them work) ... this disable-optimization
  should no longer be required.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94820 13f79535-47bb-0310-9956-ffa450edef68
2002-04-26 22:23:06 +00:00
Graham Leggett
3b2f5cea1f Apply a patch to compile cleanly again against changes to the shared memory
implementation in APR.
PR:
Obtained from:
Submitted by:	Eduardo Garcia Lopez <egarcia@stream18.com>
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94818 13f79535-47bb-0310-9956-ffa450edef68
2002-04-26 21:54:38 +00:00
Jeff Trawick
3b7f35cd82 fix a compile break on EBCDIC machines
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94812 13f79535-47bb-0310-9956-ffa450edef68
2002-04-26 14:43:18 +00:00
Jeff Trawick
9a1842b70c get basic HTTP proxy working on EBCDIC machines
(I would bet that there is more work to do throughout proxy, but at least
it can serve some pages now)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94811 13f79535-47bb-0310-9956-ffa450edef68
2002-04-26 12:29:38 +00:00
Jeff Trawick
d439ef140b get mod_proxy to build on EBCDIC machines
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94808 13f79535-47bb-0310-9956-ffa450edef68
2002-04-25 22:12:51 +00:00
Jeff Trawick
472d9e13cb fix a compiler error with picky compilers that (correctly) don't let
you add to void *


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94804 13f79535-47bb-0310-9956-ffa450edef68
2002-04-25 19:57:32 +00:00
Jeff Trawick
f0395e0617 Allow mod_unique_id to work on systems with no IPv4 address
corresponding to their host name.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94802 13f79535-47bb-0310-9956-ffa450edef68
2002-04-25 18:04:40 +00:00
William A. Rowe Jr
ed9fceafe3 Trade one signedness mismatch for another, but choose the one that is
known to be a positive value.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94801 13f79535-47bb-0310-9956-ffa450edef68
2002-04-25 18:03:41 +00:00
William A. Rowe Jr
0f183a2e01 Not yet added to the default build, but curious if they build and run.
mod_deflate tested with both zlib 1.1.3/1.1.4, unpacked in srclib/zlib/.
  Zlib only seems to have .dll builds, not very efficient when a single
  binary is built against sources, so we compile the appropriate sources.
  Your mileage may vary.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94800 13f79535-47bb-0310-9956-ffa450edef68
2002-04-25 18:01:44 +00:00
Justin Erenkrantz
924fc33d06 Fix suexec invocations from userdir - the ~ was not being prepended to the
uid per our convention.  Therefore, bad things would happen (like we
wouldn't cd to the right directory).

Add a flag to the ap_unix_identity_t structure to indicate if we are in
a userdir - if so, prefix the ~.

(Modified by Justin, but Colm's patch pointed me in the right direction.)

PR: 7810
Submitted by:	Colm <colmmacc@redbrick.dcu.ie>
Reviewed by:	Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94791 13f79535-47bb-0310-9956-ffa450edef68
2002-04-25 07:18:40 +00:00
Justin Erenkrantz
c39cfec848 Since UserDir is a raw argument, our config system allows it to be blank.
To save us all the hassle, just flat out reject this silliness.  We could
treat blank as ".", but let the user shoot themselves in the foot
explicitly (and don't give them any ideas on how to do it).

PR: 8472


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94790 13f79535-47bb-0310-9956-ffa450edef68
2002-04-25 06:16:06 +00:00
Justin Erenkrantz
8e1a89e148 We must always use case-insensitive comparisons in mod_mime even if
our platform is not "case-blind."  This matches 1.3 behavior and our
docs say that the extension argument is case-insensitive anyway.

This is case where the code fix is easier than the doc fix.  =)

PR: 8223


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94789 13f79535-47bb-0310-9956-ffa450edef68
2002-04-25 05:40:15 +00:00
Brian Havard
cd4b403c64 Get proxy protocol modules to build on OS/2. This adds the mod_proxy dll's
import library to the link, making the public symbols in it available to the
protocol modules at build time.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94788 13f79535-47bb-0310-9956-ffa450edef68
2002-04-25 03:16:44 +00:00
Graham Leggett
7eec825b4a Add an intelligent error message should no proxy submodules be
valid to handle a request.
PR: 8407
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94785 13f79535-47bb-0310-9956-ffa450edef68
2002-04-24 17:40:48 +00:00
Justin Erenkrantz
33e0746661 The force-response-1.0 and downgrade-1.0 checks were swapped. This
would mean that downgraded requests were ineligible for force-response
checks.

Previously, 1.3 would do the downgrade in process_request_internal and
then the force-response later on in basic_http_header.

PR: 8357


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94771 13f79535-47bb-0310-9956-ffa450edef68
2002-04-23 22:15:09 +00:00
Sander Striker
71f960866f Update for APR rename of apr_get_groupname to apr_group_name_get.
Submitted by: Thom May <thom@planetarytramp.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94752 13f79535-47bb-0310-9956-ffa450edef68
2002-04-22 10:27:01 +00:00
Cliff Woolley
768d65eeac AcceptPathInfo was totally backwards... it would reject when set to on and
by default and accept when set to off for the default handler, and would
reject only if set to accept for mod_cgi(d) and mod_isapi.

PR: 8234


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94751 13f79535-47bb-0310-9956-ffa450edef68
2002-04-22 08:08:38 +00:00
Brian Pane
a040b262c5 Optimization: short-circuit out of ap_set_byterange() more quickly if the
client isn't requesting a range


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94746 13f79535-47bb-0310-9956-ffa450edef68
2002-04-22 05:05:50 +00:00
Brian Pane
6b59ee40b9 Skip a potentially heavyweight call to sysconf, plus some
local variable initializations, in the common case where the
request is not for the server status page


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94745 13f79535-47bb-0310-9956-ffa450edef68
2002-04-22 04:48:11 +00:00
Bill Stoddard
921846bd03 Failure to fork cgid is a shooting offense.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94743 13f79535-47bb-0310-9956-ffa450edef68
2002-04-22 01:36:49 +00:00
Cliff Woolley
2a644fbdb8 Fix HTML 3.2 validation error: &O is not a valid entity. Should be &amp;O
Reported by: validator.w3.org


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94740 13f79535-47bb-0310-9956-ffa450edef68
2002-04-21 19:10:07 +00:00
Cliff Woolley
219a3a1011 Fix mod_autoindex output with SuppressRules turned on.
PR: 8016
Submitted by: David Shane Holden <dpejesh@yahoo.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94739 13f79535-47bb-0310-9956-ffa450edef68
2002-04-21 18:35:26 +00:00
Brian Pane
166b62f9c5 Added ap_recent_rfc822_date(), which uses the recent timestamp cache
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94735 13f79535-47bb-0310-9956-ffa450edef68
2002-04-21 07:55:50 +00:00
Bradley Nicholes
f9ae19893c Added the NetWare make files to build the proxy modules
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94729 13f79535-47bb-0310-9956-ffa450edef68
2002-04-19 21:01:16 +00:00
Bradley Nicholes
e08a4842d4 Added the NetWare .def files to build the proxy modules
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94728 13f79535-47bb-0310-9956-ffa450edef68
2002-04-19 21:00:27 +00:00
Paul J. Reder
ef6c5b6076 Moved the call to apr_mmap_dup outside the error branch so
that it would actually get called. This fixes a core dump
 at init everytime you use the MMapFile directive. [Paul J. Reder]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94721 13f79535-47bb-0310-9956-ffa450edef68
2002-04-19 19:16:23 +00:00
Jeff Trawick
e90e977d15 Trigger an error when a LoadModule directive attempts to
load a module which is built-in.  This is a common error when
switching from a DSO build to a static build.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94719 13f79535-47bb-0310-9956-ffa450edef68
2002-04-19 18:31:20 +00:00
Justin Erenkrantz
1826f624eb Switch ap_http_filter to use ap_get_brigade and apr_brigade_flatten
instead of ap_getline - this prevents some odd looping issues that
can cause problems.

Also, when we call get_mime_headers to read the trailers, we need
to reset our ctx->state to BODY_NONE - there should only be MIME-header
information (followed by a blank CRLF line) - and we don't know
how much data there will be - so it is by definition BODY_NONE.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94704 13f79535-47bb-0310-9956-ffa450edef68
2002-04-18 22:50:54 +00:00
Justin Erenkrantz
ba6cf79dee Fix so that we can compile with OpenSSL 0.9.8-dev.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94696 13f79535-47bb-0310-9956-ffa450edef68
2002-04-18 08:45:34 +00:00
Bill Stoddard
82e823ea90 Fix seg fault when garbage collecting an expired entry. remove_entity
should just remove the object from the cache and set the cleanup flag
in the object. decrement_refcount will clean the object up when the refcount
goes to zero.

Defect reported by Jean-Jacques Clar at Novell.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94683 13f79535-47bb-0310-9956-ffa450edef68
2002-04-17 18:52:32 +00:00
Jeff Trawick
8afc887cae don't call strchr(); we have a safer version -- ap_strchr_c()
Submitted by:	Stas Bekman
Reviewed by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94677 13f79535-47bb-0310-9956-ffa450edef68
2002-04-17 13:06:32 +00:00