1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00

600 Commits

Author SHA1 Message Date
Nick Kew
e696c7a4cf Fix up header in mod_dbd.h (I remembered .c but not .h before previous commit)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170730 13f79535-47bb-0310-9956-ffa450edef68
2005-05-18 09:23:20 +00:00
Nick Kew
b5198abba6 Committing mod_dbd as new.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170729 13f79535-47bb-0310-9956-ffa450edef68
2005-05-18 09:19:34 +00:00
William A. Rowe Jr
20d06d7a06 Reintroduce stack frame construction with /Oy- (removal was implied by /O2).
This makes binaries far easier to debug, during operation and for post-crash
  .dmp analysis.  Do not alter /Gs optimizations per brane.

Reviewed by: stoddard, brane

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170253 13f79535-47bb-0310-9956-ffa450edef68
2005-05-15 19:11:57 +00:00
Joe Orton
a0570c8746 Move the POSIX reg* implementations into the ap_* namespace;
internalise the ap_reg*<->PCRE wrapper:

* configure.in: Add srclib/pcre to the include path.

* include/ap_regex.h: Renamed from include/pcreposix.h.  Prefix all
constants with AP_; prefix all functions and types with ap_.  Define
AP_DECLARE to nothing if necessary.  Remove regcomp error codes.

* include/httpd.h: Include ap_regex.h not pcreposix.h.
(ap_pregcomp, ap_regexec, ap_regfree): s/regex_t/ap_regex_t/.
(ap_regexec, ap_regerror): Prototypes moved to ap_regex.h.

* server/util.c (regex_cleanup, ap_pregcomp, ap_pregsub, ap_pregfree):
Adjust for ap_ prefixed types.  (ap_regexec, ap_regerror): Removed.

* server/Makefile.in: Build util_pcre.c.

* server/util_pcre.c: Copied from srclib/pcre/pcreposix.c; remove use
of PCRE-internals to do error mapping; rename types to add AP_/ap_
prefixes as above.  Use APR includes.  (ap_regerror): Use apr_snprintf.

* srclib/pcre/Makefile.in: Don't build pcreposix.c into libpcre.la.

* modules/*: Update to use new type and constant names.

PR: 27750 (part one)
Submitted by: Andres Salomon <dilinger voxel.net>, Joe Orton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153384 13f79535-47bb-0310-9956-ffa450edef68
2005-02-11 12:00:41 +00:00
Justin Erenkrantz
905cdf9f0b Update copyright year to 2005 and standardize on current copyright owner line.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151408 13f79535-47bb-0310-9956-ffa450edef68
2005-02-04 20:28:49 +00:00
William A. Rowe Jr
d962fcfc8b FINALLY Correct ap_http_method()! It is NOT a method, it's a SCHEME!
Bumped mmn, and ap module cookie, for this function rename.

  It's not a deprecation, as ap_http_method would be a lovely function
  name sometime in the future: to determine what the function name implies.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@123882 13f79535-47bb-0310-9956-ffa450edef68
2005-01-02 05:33:44 +00:00
Bradley Nicholes
804ff9ab22 Allow APR to exist and build outside of the httpd/srclib file structure
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106975 13f79535-47bb-0310-9956-ffa450edef68
2004-11-30 00:12:39 +00:00
Bradley Nicholes
1918883c39 Move mod_cache out of experimental for the NetWare build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106757 13f79535-47bb-0310-9956-ffa450edef68
2004-11-27 20:42:00 +00:00
Bradley Nicholes
da062b024d Add mod_filter to the NetWare build.
Submitted by:normw bocnet.com.au

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106745 13f79535-47bb-0310-9956-ffa450edef68
2004-11-27 19:40:49 +00:00
Justin Erenkrantz
63dd4623e1 At long last, promote mod_cache and friends out of experimental/.
Also, take quick pass through docs files to remove experimental label for them.

Reviewed by: Paul Querna, Bill Stoddard, Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106737 13f79535-47bb-0310-9956-ffa450edef68
2004-11-27 19:06:48 +00:00
Nick Kew
9e804e259e Use ap_log_cerror and loglevel debug in filter_trace
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106691 13f79535-47bb-0310-9956-ffa450edef68
2004-11-27 08:04:01 +00:00
Joe Orton
c36ecfa64f Remove the .cvsignore files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105796 13f79535-47bb-0310-9956-ffa450edef68
2004-11-19 09:07:29 +00:00
Justin Erenkrantz
3380d808ed mod_disk_cache: Remove a bunch of non-implemented garbage collection
and cache size directives that are now available through htcacheclean.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105699 13f79535-47bb-0310-9956-ffa450edef68
2004-11-06 07:56:20 +00:00
Joe Orton
5da2cc3d8e * modules/experimental/mod_disk_cache.c (recall_headers,
create_entity): Remove unused variables.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105686 13f79535-47bb-0310-9956-ffa450edef68
2004-11-04 21:51:12 +00:00
Nick Kew
6f349a2b3d PR: 29709,32051
Submitted by: Gabriel Kalkuhl
Add warning notice about basing code on mod_example.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105679 13f79535-47bb-0310-9956-ffa450edef68
2004-11-04 10:04:16 +00:00
Nick Kew
fc0a01f194 Fix compile trouble.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105648 13f79535-47bb-0310-9956-ffa450edef68
2004-11-01 10:00:52 +00:00
Nick Kew
62f6d3d6bd Change FilterDeclare/FilterProvider semantics as discussed in
http://marc.theaimsgroup.com/?l=apache-httpd-dev&m=109899588616670&w=2


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105646 13f79535-47bb-0310-9956-ffa450edef68
2004-10-31 18:00:43 +00:00
Nick Kew
a5278a9c0b Fixup broken handling of range header.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105613 13f79535-47bb-0310-9956-ffa450edef68
2004-10-28 13:21:08 +00:00
Nick Kew
8bed492892 Fix mod_filter to support the case where a provider sets its own f->ctx
in its filter_init [grumble about filter_init ....]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105604 13f79535-47bb-0310-9956-ffa450edef68
2004-10-27 10:46:26 +00:00
Nick Kew
ae6b8dcb99 Move ap_filter_provider_t back out of public API
(suggested by nd; makes sense to niq)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105603 13f79535-47bb-0310-9956-ffa450edef68
2004-10-27 09:20:33 +00:00
Jean-Jacques Clar
ac4c881fba fixed a type match warning on NetWare
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105594 13f79535-47bb-0310-9956-ffa450edef68
2004-10-25 16:08:09 +00:00
Justin Erenkrantz
41ee74561c mod_cache: Add CacheIgnoreHeaders directive.
(Justin made some minor tweaks to the patch.)

PR: 30399
Submitted by:	R�diger Pl�m <r.pluem@t-online.de>
Reviewed by:	Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105569 13f79535-47bb-0310-9956-ffa450edef68
2004-10-23 17:45:55 +00:00
Paul Querna
923e847ade use the correct struct for CacheDisable.
(cache_disable instead of cache_enable)

PR: 31128
Submitted by: Edward Rudd <eddie omegaware.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105510 13f79535-47bb-0310-9956-ffa450edef68
2004-10-18 00:49:31 +00:00
André Malo
a9a11aab67 allow <= and >= for filter dispatcher
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105507 13f79535-47bb-0310-9956-ffa450edef68
2004-10-17 18:31:44 +00:00
André Malo
bb5a48b58e minor optimizations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105506 13f79535-47bb-0310-9956-ffa450edef68
2004-10-17 17:05:59 +00:00
André Malo
9336f02135 style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105505 13f79535-47bb-0310-9956-ffa450edef68
2004-10-17 16:58:10 +00:00
André Malo
d4e324f687 actually reg_extended has no effect in pcre context.
It's probably more confusing for users


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105504 13f79535-47bb-0310-9956-ffa450edef68
2004-10-17 16:24:34 +00:00
André Malo
a3d6111d89 oops. removed a space too much
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105503 13f79535-47bb-0310-9956-ffa450edef68
2004-10-17 16:01:24 +00:00
André Malo
ab98b109df style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105502 13f79535-47bb-0310-9956-ffa450edef68
2004-10-17 16:00:02 +00:00
André Malo
551b03d1fb use more speaking names
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105501 13f79535-47bb-0310-9956-ffa450edef68
2004-10-17 15:44:21 +00:00
André Malo
00435c29c1 style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105498 13f79535-47bb-0310-9956-ffa450edef68
2004-10-17 14:07:09 +00:00
André Malo
b2002ed3e3 style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105497 13f79535-47bb-0310-9956-ffa450edef68
2004-10-17 14:03:09 +00:00
André Malo
ce8f5b1d25 - the bucket types already store their names; use them.
- use APR_SIZE_T_FMT for writing an apr_size_t value.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105496 13f79535-47bb-0310-9956-ffa450edef68
2004-10-17 13:58:57 +00:00
André Malo
a24459644f use standard copyright notice
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105495 13f79535-47bb-0310-9956-ffa450edef68
2004-10-17 13:15:05 +00:00
André Malo
8e093a6c73 OR_ALL is not a good choice. Use more restrictive permissions for the
mod_filter directives.

OR_OPTIONS for all but FilterTrace, which isn't allowed in htaccess,
because it could DoS the server (see docs).

We should consider to introduce an allowoverride filters or so.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105477 13f79535-47bb-0310-9956-ffa450edef68
2004-10-15 23:38:54 +00:00
André Malo
0c85c24b0d fix compiler warnings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105476 13f79535-47bb-0310-9956-ffa450edef68
2004-10-15 23:30:47 +00:00
André Malo
6beaba43ea style guide, no code changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105475 13f79535-47bb-0310-9956-ffa450edef68
2004-10-15 23:22:04 +00:00
André Malo
e5f287129c add mod_filter to the configure parameters
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105474 13f79535-47bb-0310-9956-ffa450edef68
2004-10-15 23:21:31 +00:00
André Malo
5824dded04 the compiler warns about possibly uninitialized values. He may be right.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105398 13f79535-47bb-0310-9956-ffa450edef68
2004-10-10 15:29:15 +00:00
Justin Erenkrantz
111edd2b76 mod_disk_cache: don't store hop-by-hop headers on-disk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105368 13f79535-47bb-0310-9956-ffa450edef68
2004-10-02 16:59:52 +00:00
Justin Erenkrantz
7d2caa8d9b Try to correctly follow RFC 2616 13.3 on validating stale cache responses by
teaching mod_cache's cache_select_url and cache_save_filter how to deal with
this corner case.

* modules/experimental/cache_storage.c
  (cache_select_url): If we have a stale entry, save the handle so that
  cache_save_filter can use it later, and make the request conditional.
* modules/experimental/cache_util.c
  (ap_cache_request_is_conditional): Take in a table rather than request_rec.
* modules/experimental/mod_cache.c
  (cache_out_filter): Fix bogus comment.
  (cache_save_filter): If we have already responded to the client, block all
  data; correctly merge in 'stale' handles that are not really stale; set
  r->status where appropriate; serve cached response if 'fresh'
* modules/experimental/mod_cache.h
  (cache_info): Add a status field.
  (cache_request_rec): Add stale handle field and note we may block responses.
  (ap_cache_request_is_conditional): Update prototype.
* modules/experimental/mod_disk_cache.c
  (store_headers): Use cache_info status instead of r->status.
* modules/experimental/mod_mem_cache.c
  (recall_headers): Properly recall the status field.
  (store_headers): Store the status field via cache_info status.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105322 13f79535-47bb-0310-9956-ffa450edef68
2004-09-28 17:37:54 +00:00
Justin Erenkrantz
9c31031d14 mod_disk_cache: Do not store aborted content.
PR: 21492
Submitted by:	R�diger Pl�m <r.pluem t-online.de>
Reviewed by:	Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105317 13f79535-47bb-0310-9956-ffa450edef68
2004-09-28 16:26:48 +00:00
Justin Erenkrantz
2b3c92051d mod_disk_cache: Correctly store cached content type.
PR: 30278
Submitted by:	R�diger Pl�m <r.pluem t-online.de>
Reviewed by:	Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105315 13f79535-47bb-0310-9956-ffa450edef68
2004-09-28 16:17:38 +00:00
Justin Erenkrantz
22e1735a7a Tell mod_mem_cache that we will no longer be serving this object if it is stale.
Submitted by: Bill Stoddard
Reviewed by:  Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105280 13f79535-47bb-0310-9956-ffa450edef68
2004-09-24 01:22:47 +00:00
Justin Erenkrantz
fb8f33fc99 Fix race conditions in mod_disk_cache by properly using the tempfile rather
than the data file.  (We rename the tempfile when we're completed with the data
file which is an atomic operation.)

Part of the code assumed that it was using a temporary file; other parts
wrote directly to the body file - which was incorrect.  So, clean up the
whole mess to be consistent and more correct.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105261 13f79535-47bb-0310-9956-ffa450edef68
2004-09-22 22:28:54 +00:00
Justin Erenkrantz
3d6899d8e3 Cleanup a style nit. No functional changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105260 13f79535-47bb-0310-9956-ffa450edef68
2004-09-22 22:25:45 +00:00
Justin Erenkrantz
f42af965bf Fix up some comments in CACHE_SAVE filter and fix a minor style nit.
No functional changes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105259 13f79535-47bb-0310-9956-ffa450edef68
2004-09-22 22:02:13 +00:00
Justin Erenkrantz
0427774f8d Fix Expires (freshness) handling in mod_cache.
Previously, if the cached copy was stale, the response would go into an
indeterminate state.  Therefore, the freshness check must be done before we
'accept' the response and, if it fails (i.e.  stale), we can't allow any side
effects.

This caused a number of changes to how mod_disk_cache reads its headers as
ap_scan_script_header_err() purposely has side-effects and that's
unacceptable.  So, factor out only what we need.

Also, remove the broken conditional filter code as you can't reliably alter the
filter list once the response is started.  (Regardless, cache_select_url()
has the freshness checks now.)

Assist to Sascha Schumann for reporting mod_cache was busted.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105236 13f79535-47bb-0310-9956-ffa450edef68
2004-09-21 22:56:23 +00:00
Nick Kew
15f0eafebd Update to enable mod_filter harness to be a Provider (for chaining rules).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105233 13f79535-47bb-0310-9956-ffa450edef68
2004-09-21 22:46:30 +00:00
Nick Kew
72fb770d1a Merge mod_filter with util_filter structs; add API for protocol stuff.
Rename FilterDebug directive to FilterTrace.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105226 13f79535-47bb-0310-9956-ffa450edef68
2004-09-21 10:14:40 +00:00