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

2432 Commits

Author SHA1 Message Date
Bill Stoddard
f34f03bfac This is a bug or two away from working... Open both the header and data
files in the open_entity call. Need to be a bit smarter in managing the
cache_info structure


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93421 13f79535-47bb-0310-9956-ffa450edef68
2002-02-14 23:04:43 +00:00
Bill Stoddard
5744aefd95 Stuff is getting put in the cache. Still not serving out of the cache though.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93409 13f79535-47bb-0310-9956-ffa450edef68
2002-02-14 03:27:10 +00:00
Bill Stoddard
3c6da291d7 Set some meaningful defaults on dirlevels and dirlength. Getting closer...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93405 13f79535-47bb-0310-9956-ffa450edef68
2002-02-14 03:08:23 +00:00
Aaron Bannert
5700c79bc2 Fix other_child logic that would cause the mod_cgid process not
to properly die when the parent process shuts down.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93404 13f79535-47bb-0310-9956-ffa450edef68
2002-02-14 02:49:07 +00:00
Bill Stoddard
51139d2798 More APR'izing and general cleanup. Need to handle the temp file correctly...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93395 13f79535-47bb-0310-9956-ffa450edef68
2002-02-13 19:16:08 +00:00
Bill Stoddard
c9effcf962 APR'ize some codepaths. Implement mkdir_structure. General cleanup...
It's getting closer to working but still a ways off.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93394 13f79535-47bb-0310-9956-ffa450edef68
2002-02-13 18:46:13 +00:00
Bill Stoddard
42512ee7ab Set some defaults...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93391 13f79535-47bb-0310-9956-ffa450edef68
2002-02-13 15:59:39 +00:00
Bill Stoddard
bf1ca65eff Move mod_disk_cache specific fields out of the cache_obj and into the
disk_cache_object_t.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93390 13f79535-47bb-0310-9956-ffa450edef68
2002-02-13 15:25:39 +00:00
William A. Rowe Jr
3d4731f15d Address the issue raised on list that users with a LanguagePriority
directive alone expect 'ForceLanguagePriority Prefer' behavior even
  if that directive is omitted.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93383 13f79535-47bb-0310-9956-ffa450edef68
2002-02-13 02:55:17 +00:00
William A. Rowe Jr
b6b88b967e What happened? 0.9.6b built just dandy without the flags... 0.9.6c won't
build for jack without these changes.  Of course they don't harm 0.9.6b
  builders either, unless they are outside of the states/EU/AU and find
  themselves free to ignore IP considerations.

  I'd really like to know _why_ 0.9.6c doesn't configure itself rationally.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93381 13f79535-47bb-0310-9956-ffa450edef68
2002-02-12 23:19:32 +00:00
Ian Holsman
13b7646745 another race condition.
also.. changed the logic slightly.
it will remove the name retrieved, not what the object has.

sorry for the spam.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93380 13f79535-47bb-0310-9956-ffa450edef68
2002-02-12 23:13:53 +00:00
Ian Holsman
a04f6402b2 once more with feeling
obj was set before the mutex so someone could have came and updated h->cache_obj
between us setting obj, and useing it.
running now for 10 minutes without core (a record!)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93379 13f79535-47bb-0310-9956-ffa450edef68
2002-02-12 22:54:16 +00:00
Ian Holsman
e5d12da5a0 fix a race condition.
2 threads both trying to remove the same URL at the same time.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93378 13f79535-47bb-0310-9956-ffa450edef68
2002-02-12 22:11:30 +00:00
Bill Stoddard
8cb5dbee43 Out foul tabs. No function change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93375 13f79535-47bb-0310-9956-ffa450edef68
2002-02-12 17:41:35 +00:00
Greg Stein
06fc145f72 Get rid of the DAVParam support. That was a concept to help out
mod_dav providers in the 1.0.x series. Nowadays, the providers are
full-fledged Apache modules and can define their own directives and
set up per-server and per-directory parameters. (for example,
mod_dav_fs and the DAVLockDB directive)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93348 13f79535-47bb-0310-9956-ffa450edef68
2002-02-09 01:57:38 +00:00
Ian Holsman
398690311d add another log message showing when we server a cached file (as info not debug)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93344 13f79535-47bb-0310-9956-ffa450edef68
2002-02-08 19:58:26 +00:00
Bradley Nicholes
2ffd318c88 Added .def files for build on NetWare
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93338 13f79535-47bb-0310-9956-ffa450edef68
2002-02-08 18:31:32 +00:00
Bradley Nicholes
b5c622e3f9 Updated to use the newer locking APIs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93337 13f79535-47bb-0310-9956-ffa450edef68
2002-02-08 18:29:17 +00:00
Ian Holsman
797e5394c1 style police
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93333 13f79535-47bb-0310-9956-ffa450edef68
2002-02-08 06:09:34 +00:00
Justin Erenkrantz
00ad366b42 That check is superfluous since we must have savename defined
(otherwise, we'd get APR_INCOMPLETE on apr_dir_read).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93330 13f79535-47bb-0310-9956-ffa450edef68
2002-02-07 06:50:52 +00:00
Justin Erenkrantz
795f15723d Allow mod_autoindex to serve symlinks if permitted and optimize our stats
so that only one stat() is needed.

If we get APR_FINFO_MIN bits, lookup_dirent won't do a repeated stat()
call.  So, let's do it here.  Also, if we see a symlink, expand it.
(Technically, we don't *have* to expand the symlinks - the resolve_symlink
fix handles that, but we can't really assume that.)  Since we know that
dirent will be rr->finfo anyway, go back to relying on dirent only for
APR_DIR checks.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93329 13f79535-47bb-0310-9956-ffa450edef68
2002-02-07 06:37:09 +00:00
Justin Erenkrantz
f62c2d835b Remove all non-portable DBM calls in mod_auth_dbm and rely only on the
apr-util DBM code.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93260 13f79535-47bb-0310-9956-ffa450edef68
2002-02-05 22:41:18 +00:00
Ryan Bloom
862f407872 Remove the install_transport_filters hook. The same function can be
acheived with the pre_connection hook.  I have added the socket to the
pre_connection phase to make this possible.
Reviewed by:	Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93259 13f79535-47bb-0310-9956-ffa450edef68
2002-02-05 22:18:49 +00:00
Cliff Woolley
e2b7e4bd89 Vetoed by Ken
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93256 13f79535-47bb-0310-9956-ffa450edef68
2002-02-05 15:35:54 +00:00
Ken Coar
d19986c33b Change the 'we turned /foo into http://host/foo' log message
to DEBUG; no reason to clutter people's log files with this
	when it's supported behaviour.  Of course, they can find out
	about the performance impact by LogLeveling Debug. :-)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93251 13f79535-47bb-0310-9956-ffa450edef68
2002-02-05 11:35:57 +00:00
Cliff Woolley
87e7dd20a9 List files that would result in HTTP_UNAUTHORIZED in addition to
successes and redirections, since there's a chance the client will
actually have the proper authorization to retrieve them.

Reported by:	Stas Bekman


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93250 13f79535-47bb-0310-9956-ffa450edef68
2002-02-05 09:26:02 +00:00
Bill Stoddard
7354d00ead Misc cleanup to fix compile warnings and a segfault. This module is still
a long ways from doing anything useful, but every bit helps.

Submitted by: Joe Norton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93246 13f79535-47bb-0310-9956-ffa450edef68
2002-02-05 02:48:34 +00:00
Bill Stoddard
f1041c39f5 Add the return type to the function definition.
Submitted by: Joe Norton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93245 13f79535-47bb-0310-9956-ffa450edef68
2002-02-05 02:47:29 +00:00
Ian Holsman
15a4252225 add a optional function ap_cache_generate_key
which allows a 3rd party module to generate the key name based
on the request_rec.

the idea here is for it to also be able to mess with expiry times
and cachability

add another option.. CacheIgnoreCacheControl. this ignores a 'incoming request's
attempts to get a fresh copy. Mainly I see this as being usefull in r-proxy's


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93242 13f79535-47bb-0310-9956-ffa450edef68
2002-02-05 00:15:42 +00:00
Greg Ames
6cbb3ef98e vetoing and backing out OtherBill's patch rev 1.91. This breaks
mod_autoindex on systems such as Unix where apr_dir_read doesn't automatically
return the filetype.  You see a '?' icon rather than a folder icon
for directories on 2.0.31 because mod_autoindex doesn't realize that the thing
is a directory.

No, we don't want more stat()s either.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93232 13f79535-47bb-0310-9956-ffa450edef68
2002-02-04 21:19:08 +00:00
Bill Stoddard
a771a33db8 Bringing up some code to our coding style guidelines
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93221 13f79535-47bb-0310-9956-ffa450edef68
2002-02-04 14:48:55 +00:00
Bill Stoddard
147e1301f6 Coding before the first cup of coffee.... Thanks to Martin for pointing this
out.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93220 13f79535-47bb-0310-9956-ffa450edef68
2002-02-04 14:43:11 +00:00
Bill Stoddard
1d5e1efe53 CacheRoot takes an argument.
Patch submitted by: Joe Norton <norton@alum.mit.edu>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93218 13f79535-47bb-0310-9956-ffa450edef68
2002-02-04 13:06:45 +00:00
Martin Kraemer
34e0d8cf5d Oops. Use ftp_check_globbingchars().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93217 13f79535-47bb-0310-9956-ffa450edef68
2002-02-04 10:11:29 +00:00
Martin Kraemer
c5ef15249d And update the year....
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93216 13f79535-47bb-0310-9956-ffa450edef68
2002-02-04 10:07:10 +00:00
Martin Kraemer
9f645d6622 React (in the dir lister) on the same globbing chars as used in the escaping routine
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93215 13f79535-47bb-0310-9956-ffa450edef68
2002-02-04 10:06:37 +00:00
Ian Holsman
b83f884f1e make it compile on win32
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93214 13f79535-47bb-0310-9956-ffa450edef68
2002-02-04 04:43:34 +00:00
Bill Stoddard
db91e13b5f mod_disk_cache cleanup. Pass request_rec on the open_entity call.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93207 13f79535-47bb-0310-9956-ffa450edef68
2002-02-03 19:04:15 +00:00
Justin Erenkrantz
1ed7a6d590 Oh, no. It's legal to have 0 bytes read. Just not -1. If *that* happens,
I want to see a core.  0 bytes reads are fine.  Grr.

(I'm so tempted to throw this assert out, but if we get -1 length
brigades back, we're gonna be screwed.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93202 13f79535-47bb-0310-9956-ffa450edef68
2002-02-03 17:43:35 +00:00
Justin Erenkrantz
59874f5443 Make sure we include time.h if it is there. (Other mojo may be needed for
other platforms.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93201 13f79535-47bb-0310-9956-ffa450edef68
2002-02-03 17:18:18 +00:00
Bill Stoddard
2e47d4b924 Some coding style tweaks. No function change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93197 13f79535-47bb-0310-9956-ffa450edef68
2002-02-03 06:28:52 +00:00
Bill Stoddard
1d5a371a5c Support files for mod_disk_cache. Some tweaks to arguments on various hook
calls. Still lots of cleanup work to do here...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93196 13f79535-47bb-0310-9956-ffa450edef68
2002-02-03 06:24:55 +00:00
Bill Stoddard
85e57f60fc MS Project file for mod_disk_cache
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93195 13f79535-47bb-0310-9956-ffa450edef68
2002-02-03 06:23:10 +00:00
Bill Stoddard
fdae4a165b Fix a few compile errors.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93194 13f79535-47bb-0310-9956-ffa450edef68
2002-02-03 06:14:10 +00:00
Bill Stoddard
a147b916f4 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93193 13f79535-47bb-0310-9956-ffa450edef68
2002-02-03 06:11:40 +00:00
Cliff Woolley
7b7ec65b73 Silence a gcc warning about cpType being possibly used uninitialized,
and constify it while I'm at it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93188 13f79535-47bb-0310-9956-ffa450edef68
2002-02-03 01:50:58 +00:00
Bill Stoddard
2017c84578 Remove the CACHE_IN filter is we are not doing caching
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93182 13f79535-47bb-0310-9956-ffa450edef68
2002-02-02 16:40:52 +00:00
Bill Stoddard
e4cd22b01e Add a few more checks to determine a response should be cached.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93181 13f79535-47bb-0310-9956-ffa450edef68
2002-02-02 16:20:33 +00:00
Bill Stoddard
bd3d360392 Reintroduce the create_connection hook. This hook is required to enable
modules to completely take over all network i/o from the core.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93171 13f79535-47bb-0310-9956-ffa450edef68
2002-02-01 22:16:31 +00:00
Jeff Trawick
556b417899 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93170 13f79535-47bb-0310-9956-ffa450edef68
2002-02-01 22:08:34 +00:00