1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-20 04:06:16 +03:00
Commit Graph

3222 Commits

Author SHA1 Message Date
Cliff Woolley
3f17febee2 add some debugging code -- verifies that the heap property is satisfied
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96367 13f79535-47bb-0310-9956-ffa450edef68
2002-08-13 23:47:50 +00:00
Greg Ames
65b5ceef11 fix weird things that happen with canned error messages due to using two
different request_recs after an ErrorDocument internal redirect failure.
examples: wrong Content-Type, garbled output from ebcdic servers due to
double charset translation


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96364 13f79535-47bb-0310-9956-ffa450edef68
2002-08-13 14:27:39 +00:00
Jeff Trawick
8dcdcbde4d don't lose const looking for that '/'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96334 13f79535-47bb-0310-9956-ffa450edef68
2002-08-09 19:21:57 +00:00
William A. Rowe Jr
e85db78eaa Security rollup for 2.0.40 release. Tag and roll baby.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96327 13f79535-47bb-0310-9956-ffa450edef68
2002-08-09 17:00:44 +00:00
Greg Ames
787074640b remove some dead code. It's been there since 1996 (1.3 rev 1.28), so
extra eyeballs would be appreciated.

If it's not really dead, then we need to re-arrange this function so
that earlier changes to the r aren't lost.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96321 13f79535-47bb-0310-9956-ffa450edef68
2002-08-08 20:39:15 +00:00
Graham Leggett
7f74fe4231 Fix proxy so that it is possible to access ftp: URLs via a proxy
chain.
PR:
Obtained from:
Submitted by:	Peter Van Biesen <peter.vanbiesen@vlafo.be>
Reviewed by:	Graham Leggett <minfrin@apache.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96320 13f79535-47bb-0310-9956-ffa450edef68
2002-08-08 17:59:18 +00:00
Ian Holsman
29c4807295 mod-deflate now checks to make sure gzip-only-text-html is set to 1, not anything.
This will allow things like...
SetEnv gzip-only-text/html 1
BrowserMatch "GECKO" gzip-only-text/html=0

Obtained from: Andr� Schild <A.Schild@aarboard.ch>
Reviewed by:   Ian Holsman


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96318 13f79535-47bb-0310-9956-ffa450edef68
2002-08-07 15:26:17 +00:00
William A. Rowe Jr
26e0cc6f6d Just an observation, we potentially read/retain far too much of the body,
and this can be optimized.  Not a problem for sendfile based byterange
  requests, but potentially lethal to serve byterange requests of any
  parsed or cgi generated responses.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96304 13f79535-47bb-0310-9956-ffa450edef68
2002-08-04 18:24:10 +00:00
William A. Rowe Jr
3f2989378d We describe body lengths throughout apr in apr_off_t lengths. While we
all agree we won't ever cache an entity that huge in memory, the disk
  cache is another matter [e.g. if we cache an existing file.]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96302 13f79535-47bb-0310-9956-ffa450edef68
2002-08-03 22:39:42 +00:00
William A. Rowe Jr
a6ac024104 catch up with the apr_atoll -> apr_atoi64 rename
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96299 13f79535-47bb-0310-9956-ffa450edef68
2002-08-03 19:36:33 +00:00
William A. Rowe Jr
a7275f569a Ignore goodness for VC6 .mak file exporters
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96298 13f79535-47bb-0310-9956-ffa450edef68
2002-08-03 18:29:58 +00:00
Jeff Trawick
569ab1642f mod_ext_filter: Add the ability to enable or disable a filter via
an environment variable.  Add the ability to register a filter of
type other than AP_FTYPE_RESOURCE.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96283 13f79535-47bb-0310-9956-ffa450edef68
2002-08-01 23:26:43 +00:00
Jeff Trawick
cfdc29770e fix a typo in the last commit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96262 13f79535-47bb-0310-9956-ffa450edef68
2002-07-31 19:13:38 +00:00
Jeff Trawick
d9e22d9ce0 ignore some generated files on OS/390
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96261 13f79535-47bb-0310-9956-ffa450edef68
2002-07-31 19:09:31 +00:00
Jeff Trawick
400204baf2 support non-threaded configurations
PR:             10920


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96244 13f79535-47bb-0310-9956-ffa450edef68
2002-07-30 19:38:11 +00:00
Bill Stoddard
5d53209f9b Log error message to the client without the path name.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96241 13f79535-47bb-0310-9956-ffa450edef68
2002-07-30 18:18:03 +00:00
Greg Stein
681c858e70 In some application environments, the mod_dav hook structures are
allocated dynamically. The structures need a context pointer to
represent that dynamic "object", so a pointer was added to the end of
each of the more important structures.

While providers don't need to add this field to their structures (it
will default to NULL), I went ahead and added it to mod_dav_fs for
clarity.

No MMN bump is required because Apache does not use/examine the
fields (only the provider will set and use them).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96195 13f79535-47bb-0310-9956-ffa450edef68
2002-07-25 21:56:05 +00:00
Bradley Nicholes
5e52ad101d Fixed the ap_cgi_build_command() function for NetWare so that it correctly
builds both the CGI and SSI command strings.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96190 13f79535-47bb-0310-9956-ffa450edef68
2002-07-25 19:06:13 +00:00
Wilfredo Sanchez
a47715f8fe Replace atol() calls which should return long long with apr_atoll() calls.
Submitted by: Shantonu Sen <ssen@apple.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96179 13f79535-47bb-0310-9956-ffa450edef68
2002-07-24 20:47:28 +00:00
Ken Coar
762fc91ca1 Style police comin' through..
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96176 13f79535-47bb-0310-9956-ffa450edef68
2002-07-24 17:21:45 +00:00
Ian Holsman
ff63c46079 the directives ignorecachecontrol & ignorelastmodified weren't being set
properly for virtual hosts.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96166 13f79535-47bb-0310-9956-ffa450edef68
2002-07-24 04:05:35 +00:00
Bradley Nicholes
19702e572f Including the make file for mod_ext_filter to the main build for NetWare
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96150 13f79535-47bb-0310-9956-ffa450edef68
2002-07-22 21:20:19 +00:00
Bradley Nicholes
0c3764162f Adding the NetWare make file for mod_ext_filter
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96149 13f79535-47bb-0310-9956-ffa450edef68
2002-07-22 21:19:36 +00:00
Graham Leggett
553751a20e Fix a resource leak where LDAP connections were not being returned
to the pool after being used.
PR:
Obtained from:
Submitted by:	Scott Lamb <slamb@slamb.org>
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96142 13f79535-47bb-0310-9956-ffa450edef68
2002-07-22 10:27:14 +00:00
Joshua Slive
963d47482b Fix some hook ordering problems. mod_vhost_alias should, perhaps, be HOOK_LAST.
It redefines the document root, so it should only be used if no other mapper wants
the request.  I haven't made that change here; I've simply put explict ordering
to make sure we get

mod_alias -> mod_userdir -> mod_vhost_alias

I can't compile apache at the moment for other reasons, so this is untested,
but it looks right to me.

PR: 8853


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96137 13f79535-47bb-0310-9956-ffa450edef68
2002-07-21 18:06:51 +00:00
William A. Rowe Jr
0ecf0cce28 A half hour to waste waiting for builds... this is what you get.
mod_isapi will build and run on OSX... presume others as well unless
  I choose some awful errno values for portability.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96136 13f79535-47bb-0310-9956-ffa450edef68
2002-07-21 09:19:19 +00:00
William A. Rowe Jr
f32bed7dda Fix (safely) one minor emit [always positive, so apr_size_t cast is ok]
and introduce a win32 project for mod_charset_lite


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96121 13f79535-47bb-0310-9956-ffa450edef68
2002-07-19 08:47:55 +00:00
Bill Stoddard
69a3a7f8c7 Way too busy today.. last commit was wrong in two ways. First, 1KB is 1024
bytes, not 1000 bytes. Second, max_cache_size is already represented in bytes.
Time for a vacation.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96118 13f79535-47bb-0310-9956-ffa450edef68
2002-07-19 02:24:26 +00:00
Jeff Trawick
ea50c3d516 mod_ext_filter: Ignore any content-type parameters when checking if
the response should be filtered.  Previously, "intype=text/html"
wouldn't match something like "text/html;charset=8859_1".


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96115 13f79535-47bb-0310-9956-ffa450edef68
2002-07-18 20:31:14 +00:00
Bill Stoddard
e122b787a8 Compare bytes to bytes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96113 13f79535-47bb-0310-9956-ffa450edef68
2002-07-18 19:49:36 +00:00
Jeff Trawick
ca0dceccc6 mod_ext_filter: Set up environment variables for external programs.
Submitted by:              Craig Sebenik <craig@netapp.com>
Reviewed by:               Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96111 13f79535-47bb-0310-9956-ffa450edef68
2002-07-18 12:25:24 +00:00
Bill Stoddard
e8235537a1 Do some sanity checking on the cache config directives.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96109 13f79535-47bb-0310-9956-ffa450edef68
2002-07-18 01:29:29 +00:00
William A. Rowe Jr
347341d9eb Solve C-L post body reads from the HTTP_IN by ap_get_brigade() so that
we know -immediately- that we've read the last of the data.  This patch
  adds an EOS bucket to the brigade if ctx->remaining has been consumed.

Reviewed by:	Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96104 13f79535-47bb-0310-9956-ffa450edef68
2002-07-17 19:18:39 +00:00
Jeff Trawick
9cf303e9bc Get proxy ftp to work over IPv6.
Submitted by:                      Shoichi Sakane <sakane@kame.net>
Reviewed and modified slightly by: Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96100 13f79535-47bb-0310-9956-ffa450edef68
2002-07-17 17:55:59 +00:00
Jeff Trawick
0fd67ef418 use APR_TIME_T_FMT when formatting apr_time_t
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96099 13f79535-47bb-0310-9956-ffa450edef68
2002-07-17 16:08:53 +00:00
Jeff Trawick
977b3ca64b use APR_SIZE_T_FMT for formatting apr_size_t
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96098 13f79535-47bb-0310-9956-ffa450edef68
2002-07-17 15:06:17 +00:00
Jeff Trawick
8a45876a25 axe an unused function
fix some format strings used with apr_size_t and apr_ssize_t


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96097 13f79535-47bb-0310-9956-ffa450edef68
2002-07-17 14:52:36 +00:00
Jeff Trawick
9437341232 add notes about a portability problem -- formatting apr_time_t
in hex


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96094 13f79535-47bb-0310-9956-ffa450edef68
2002-07-17 13:50:26 +00:00
William A. Rowe Jr
5946a0196a Last missing symbols that I can find.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96093 13f79535-47bb-0310-9956-ffa450edef68
2002-07-17 07:14:59 +00:00
Cliff Woolley
9343ad90b9 this file should have the asf license on it
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96090 13f79535-47bb-0310-9956-ffa450edef68
2002-07-17 00:04:51 +00:00
Cliff Woolley
787d4cbd86 Add a couple of optimizations to the priority queue code:
* bubble_up and percolate_down do not need to do "swaps" -- they can just
   shift the existing items and reinsert the moving item once at the end
 * minchild() did not need that for loop -- a node can only ever have at
   most two children, and they are guaranteed to be adjacent


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96089 13f79535-47bb-0310-9956-ffa450edef68
2002-07-17 00:01:03 +00:00
Cliff Woolley
bb1efcfb7f header files should include everything they need to compile
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96088 13f79535-47bb-0310-9956-ffa450edef68
2002-07-16 23:58:56 +00:00
Aaron Bannert
e4e4380ff8 Optimize away a couple 64bit integer divides.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96070 13f79535-47bb-0310-9956-ffa450edef68
2002-07-16 06:35:41 +00:00
Sander Striker
849dc544bc Eat our own dogfood when it comes to the time macros.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96061 13f79535-47bb-0310-9956-ffa450edef68
2002-07-15 08:26:06 +00:00
William A. Rowe Jr
d3076d658d Fixed good. The modulos op should give us just that extra little bit we
need to be sure we sleep for a good long fraction of the second into the
  next second.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96059 13f79535-47bb-0310-9956-ffa450edef68
2002-07-15 08:15:31 +00:00
William A. Rowe Jr
676a05e337 Sleep INTO the next second, not for the entire next second.
Observed by Sander Striker


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96058 13f79535-47bb-0310-9956-ffa450edef68
2002-07-15 08:11:11 +00:00
William A. Rowe Jr
ed8fc9abae http occurances to update for apr_socket_opt_get/set
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96057 13f79535-47bb-0310-9956-ffa450edef68
2002-07-15 08:05:11 +00:00
Brian Pane
7207c17ad2 Remove a time lookup that's now unnecessary
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96056 13f79535-47bb-0310-9956-ffa450edef68
2002-07-15 07:59:31 +00:00
William A. Rowe Jr
6b69fe06c0 Timeout/time fixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96055 13f79535-47bb-0310-9956-ffa450edef68
2002-07-15 07:46:19 +00:00
William A. Rowe Jr
8df9f99e75 The macros remove how much legibility?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96054 13f79535-47bb-0310-9956-ffa450edef68
2002-07-15 07:45:11 +00:00