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

4687 Commits

Author SHA1 Message Date
Joshua Slive
d8d227c546 Disable mod_userdir by default.
This is non-backwards-compatible.  But it shouldn't effect most people,
because almost everyone has a UserDir directive in their config
anyway.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/simple-conf@160296 13f79535-47bb-0310-9956-ffa450edef68
2005-04-06 14:00:23 +00:00
Joe Orton
2ce86aa6ee * modules/proxy/mod_proxy_http.c (ap_proxy_http_process_response):
Don't send an EOS after an interim response.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@159671 13f79535-47bb-0310-9956-ffa450edef68
2005-04-01 09:30:01 +00:00
Bradley Nicholes
38e8b5da89 Implement the exported function from mod_ldap(util_ldap) as optional functions so that we can eliminate the load ordering of mod_ldap and mod_authnz_ldap.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@159619 13f79535-47bb-0310-9956-ffa450edef68
2005-03-31 18:44:16 +00:00
Bradley Nicholes
aad2e44aae Actually use the compare_cache_size value that is being set by LDAPOpCacheEntries. The actual cache_size was previously defaulting to the value of search _cache_size set by LDAPCacheEntries.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@159542 13f79535-47bb-0310-9956-ffa450edef68
2005-03-30 23:25:47 +00:00
Sander Striker
f3886551fa * modules/proxy/mod_proxy_http.c
(ap_proxy_http_process_response): Fix a comment.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@159534 13f79535-47bb-0310-9956-ffa450edef68
2005-03-30 23:09:32 +00:00
Sander Striker
1073345b0f * modules/proxy/mod_proxy_http.c
(ap_proxy_http_process_response): When there are only headers and no body,
   give the remainder of the output filters a chance by pushing an EOS bucket
   through the filter stack.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@159533 13f79535-47bb-0310-9956-ffa450edef68
2005-03-30 22:58:08 +00:00
Greg Ames
ce90c8338d update comments for *_client_block functions.
note namespace protected function names.  clarify where 100 Continue is sent.  remove 
dire warning for calling ap_should_client_block more than once since side effects
appear to be long gone.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@158791 13f79535-47bb-0310-9956-ffa450edef68
2005-03-23 16:03:55 +00:00
Paul Querna
3982db6f2d Turn LDAPTrustedClientCert and LDAPTrustedMode into the RSRC_CONF context. The current code is broken for use as OR_ALL.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@158678 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 21:35:02 +00:00
William A. Rowe Jr
cdea6cc2b9 Second fat-fingered typo in 24 hrs. Balance parens, this now compiles.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@157947 13f79535-47bb-0310-9956-ffa450edef68
2005-03-17 17:30:20 +00:00
William A. Rowe Jr
f9587e4e59 Clean up emit for size truncation. Division here ensures we fit nicely.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@157946 13f79535-47bb-0310-9956-ffa450edef68
2005-03-17 17:06:12 +00:00
Justin Erenkrantz
8bc56b5d29 mod_proxy: Add proxy-sendextracrlf option to send an extra CRLF at the
end of the request body to work with really old HTTP servers.

* modules/proxy/mod_proxy_http.c
  (stream_reqbody_cl, spool_reqbody_cl): If proxy-sendextracrlf option is
  present, append a CRLF to the body stream that isn't counted against CL.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@157478 13f79535-47bb-0310-9956-ffa450edef68
2005-03-14 22:22:58 +00:00
Sander Striker
97851ed800 Another mod_cache fixlet.
* modules/cache/mod_cache.c

  (cache_url_handler): Add more debug output.  Restore original request
   headers when CACHE_SAVE filter isn't added to fix up after the request.


* modules/cache/cache_storage.c

  (cache_select_url): Add more debug output.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@157162 13f79535-47bb-0310-9956-ffa450edef68
2005-03-11 21:39:45 +00:00
Bradley Nicholes
9182642bfd Don't attempt to remove the cache_file if one was never specified.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@156665 13f79535-47bb-0310-9956-ffa450edef68
2005-03-09 18:10:47 +00:00
Bradley Nicholes
a92c5fa98c Keep track of the number of attributes retrieved from LDAP so that all the values can be properly cached even if the value is NULL. [PR 33901]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@156587 13f79535-47bb-0310-9956-ffa450edef68
2005-03-09 00:15:01 +00:00
Paul Querna
49ff90cbe3 Add ap_mpm_is_experimental and ap_mpm_is_threaded. Use these instead of checking for specific MPMs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@156574 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 22:40:33 +00:00
Paul Querna
73f6528c2b Since prefork is currently the only non-threaded MPM, check for it, instead of testing for each threaded MPM type. This enables mod_cgid on the Event MPM by default, which is a "Good Thing"(tm).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@156572 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 22:06:59 +00:00
Sander Striker
7402943941 Make IgnoreCacheControl do what it implies when it comes to requests and
freshness checks.

* modules/cache/cache_util.c

  (ap_cache_check_freshness): Ignore CacheControl: max-age and min-fresh
   if IgnoreCacheControl is set.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@156567 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 21:11:07 +00:00
Bradley Nicholes
bb35e2f831 Make sure that the secure listen sockets that are created and injected into the ap_listeners lists by mod_nw_ssl are handled correctly so that they remain open and reused across restarts.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@156556 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 18:09:43 +00:00
Sander Striker
f92cbd8dbc Improve caching a bit more...
* modules/cache/cache_util.c

  (ap_cache_check_freshness): On Cache-Control/Pragma no-cache force
   revalidation by marking the resource as stale.  Unless IgnoreCacheControl
   is set ofcourse.

 
* modules/cache/mod_cache.c

  (cache_url_handler): Remove Cache-Control/Pragma no-cache check and
   accompagnying comment.

  (cache_save_filter): Move FIXME comment to the correct location.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@156480 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 02:35:50 +00:00
Sander Striker
c8c8263f9c Remove an unused function.
* cache_util.c
* mod_cache.imp
* mod_cache.h

  (ap_cache_request_is_conditional): Removed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@156471 13f79535-47bb-0310-9956-ffa450edef68
2005-03-08 01:34:32 +00:00
Justin Erenkrantz
a32a693014 * modules/cache/cache_util.c (ap_cache_check_freshness): Use r->headers_in not
the stored headers for the Cache-Control check.

Pointed out by: Sander Striker


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@156401 13f79535-47bb-0310-9956-ffa450edef68
2005-03-07 07:18:34 +00:00
Sander Striker
c70cb4ba14 More mod_cache tweakage...
* modules/cache/mod_cache.c

  (cache_save_filter): Instead of unconditionally returning a 304 when
   the original request was conditional and we issued a cache revalidating
   request, handle the request as if it came in while our cache was
   still valid.


* modules/cache/cache_storage.c

  (cache_select_url): Strip off the conditional headers from the original
   request, prior to adding our own for the purpose of revalidating our
   cached response.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@156330 13f79535-47bb-0310-9956-ffa450edef68
2005-03-06 18:57:22 +00:00
Sander Striker
438c65986e Tracked down by Justin Erenkrantz.
* modules/cache/mod_disk_cache.c

  (store_headers): Stop second guessing mod_cache and just store the
   headers in a new file (overwriting the old).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@156306 13f79535-47bb-0310-9956-ffa450edef68
2005-03-06 12:52:46 +00:00
Sander Striker
11344ad83a * modules/cache/mod_cache.c
(cache_url_handler): Tweak a few comments.

  (cache_save_filter): Add a FIXME for a corner case.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@156304 13f79535-47bb-0310-9956-ffa450edef68
2005-03-06 12:43:42 +00:00
Jeff Trawick
3e14f16867 worker MPM/mod_status: Support per-worker tracking of pid and
generation in the scoreboard so that mod_status can accurately
represent workers in processes which are gracefully terminating.

New child processes with worker MPM can take over slots of
individual threads within gracefully terminating processes.
Sometimes this is a problem (too many of these gracefully
terminating processes), so it is helpful to have mod_status
provide the information required to recognize these processes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@156274 13f79535-47bb-0310-9956-ffa450edef68
2005-03-05 20:06:55 +00:00
Bradley Nicholes
803296f97c If the search fails due to a bad connection, make sure that we unbind the connection so that it will be recreated the next time it is used.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@155713 13f79535-47bb-0310-9956-ffa450edef68
2005-02-28 23:25:26 +00:00
Justin Erenkrantz
427bc9ae45 * modules/dav/main/mod_dav.h: Wrap all public functions in
DAV_DECLARE or DAV_DECLARE_NONSTD.
* modules/dav/main/liveprop.c, modules/dav/main/props.c,
  modules/dav/main/util_lock.c, modules/dav/main/mod_dav.c,
  modules/dav/main/std_liveprop.c, modules/dav/main/util.c:
  Update function definitions.

Submitted by: Branko Čibej <brane xbc.nu>
Reviewed by:  Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@155345 13f79535-47bb-0310-9956-ffa450edef68
2005-02-25 16:57:14 +00:00
Joe Orton
119d90c9bc * modules/proxy/mod_proxy_http.c (ap_proxy_http_process_response): Fix
spurious error at EOF.

PR: 33615


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@155209 13f79535-47bb-0310-9956-ffa450edef68
2005-02-24 16:52:34 +00:00
Paul Querna
09f8a5c2f8 Fix a syntax error when DEBUGGING is defined.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@154199 13f79535-47bb-0310-9956-ffa450edef68
2005-02-17 22:02:16 +00:00
Joe Orton
a10288a95d * modules/ssl/mod_ssl.h: Add ssl_ext_lookup optional hook declaration.
* modules/ssl/ssl_engine_vars.c (ssl_ext_lookup): New function.
(ssl_var_register): Register optional function.

* modules/ssl/ssl_private.h (ssl_ext_lookup): Add prototype.

Submitted by: David Reid, Joe Orton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153933 13f79535-47bb-0310-9956-ffa450edef68
2005-02-15 12:39:45 +00:00
André Malo
f5550d2d6a Fix 'Anonymous *', which denied access
* modules/aaa/mod_authn_anon.c (check_anonymous):
    don't return AUTH_USER_NOT_FOUND if conf->anyuserid is configured.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153815 13f79535-47bb-0310-9956-ffa450edef68
2005-02-14 17:55:54 +00:00
Sander Striker
8062861efc Improve interaction with caches in mod_dav.
* modules/dav/main/mod_dav.c

  (dav_method_get): Check for conditionals.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153754 13f79535-47bb-0310-9956-ffa450edef68
2005-02-14 09:46:19 +00:00
Joe Orton
edb46b1de9 * include/util_ldap.h (util_ldap_state_t): Fix gcc format string
warnings: use a long for connectionTimeout since the code expects a
long.

* modules/ldap/util_ldap.c (compare_client_certs): Make static to fix
gcc missing-prototype warning.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153390 13f79535-47bb-0310-9956-ffa450edef68
2005-02-11 12:22:16 +00:00
Joe Orton
519b48fce1 * modules/cache/mod_disk_cache.c (store_body): Fix format string
warnings; print integers using _FMT strings.

* modules/cache/cache_util.c (ap_cache_check_freshness): Remove unused
variable.

* modules/cache/cache_storage.c (cache_select_url): Remove unused
variable.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153385 13f79535-47bb-0310-9956-ffa450edef68
2005-02-11 12:16:06 +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
Joe Orton
c2f37c7a4d * modules/ssl/ssl_engine_kernel.c (ssl_hook_Access): Move the
SSLUsername-controlled assignment of r->user above the SSLRequire
checks so that the "username" gets logged if SSLRequire denies access.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153280 13f79535-47bb-0310-9956-ffa450edef68
2005-02-10 18:28:43 +00:00
Sander Striker
9e2046178c More tweaks primarily driven by caching.
* modules/http/http_protocol.c

  (ap_meets_conditions): Allow If-None-Modified and If-Modified-Since
   to interact as described in RFC2616, sections 14.26 and 13.3.4.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153270 13f79535-47bb-0310-9956-ffa450edef68
2005-02-10 15:41:23 +00:00
Jeff Trawick
9ff46dd755 Remove formatting characters from ap_log_error() calls. These
were escaped as fallout from CAN-2003-0020.

Submitted by: Eric Covener <ecovener gmail.com>
Reviewed by: Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153105 13f79535-47bb-0310-9956-ffa450edef68
2005-02-09 19:01:43 +00:00
Sander Striker
c4afdce3fd Some minimal tweaks to mod_cache.
* modules/cache/mod_mem_cache.c

  (store_headers): Remove unused variable.


* modules/cache/mod_cache.c

  (cache_save_filter): Slightly improve comment.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153104 13f79535-47bb-0310-9956-ffa450edef68
2005-02-09 18:56:41 +00:00
Justin Erenkrantz
441086ecfd More work to properly handle revalidated responses correctly.
* modules/cache/mod_cache.c: If we add a new Expires value, tell our client;
  merge in headers properly (or better than before) so that we can update the
  header fields on a revalidated but with updated header fields.
* modules/cache/mod_cache.h, modules/cache/cache_storage.c:
  Add preserve_orig flag to ap_cache_accept_headers to allow updating of fields.
* modules/cache/mod_disk_cache.c: Load status value from disk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@152973 13f79535-47bb-0310-9956-ffa450edef68
2005-02-09 01:38:59 +00:00
Sander Striker
d55cef82b3 * modules/proxy/mod_proxy_ajp.c
(proxy_ajp_handler): Log error when a backend connection could not
    be made.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@152966 13f79535-47bb-0310-9956-ffa450edef68
2005-02-09 00:21:49 +00:00
Sander Striker
7b9a0e8388 * modules/proxy/proxy_util.c
(ap_proxy_pre_request): Log an error when all workers are busy.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@152964 13f79535-47bb-0310-9956-ffa450edef68
2005-02-08 23:57:50 +00:00
Sander Striker
876ee19013 More mod_cache tweakage.
* modules/cache/cache_storage.c

  (cache_select_url): Add If-Modified-Since regardless of having
    an ETag or not.  See: RFC2616, 14.26.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@152948 13f79535-47bb-0310-9956-ffa450edef68
2005-02-08 22:23:31 +00:00
Bradley Nicholes
f193418fa8 Make the function declaration match the prototype
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@152927 13f79535-47bb-0310-9956-ffa450edef68
2005-02-08 19:41:15 +00:00
Justin Erenkrantz
74a70d429a Return the proper status and headers when serving a revalidated response.
* modules/cache/mod_cache.c
  (cache_save_filter): Load in the cached status and headers; send a flush
  rather than an EOS when the client request is conditional.
* modules/cache/mod_cache.h: Export ap_cache_accept_headers.
* modules/cache/cache_storage.c: Rename accept_headers to
  ap_cache_accept_headers.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@152680 13f79535-47bb-0310-9956-ffa450edef68
2005-02-08 17:56:38 +00:00
Justin Erenkrantz
1d4c6d1c6d Cleanup structures in mod_cache and friends to remove unused or unnecessary
fields.  Also resolves a number of latent bugs due to the wrong fields being
accessed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@152679 13f79535-47bb-0310-9956-ffa450edef68
2005-02-08 17:39:56 +00:00
Jim Jagielski
5875d5f9cf If we rec' a bad response header line, ignore what we've
rec'd so far and force BAD_GATEWAY.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@152676 13f79535-47bb-0310-9956-ffa450edef68
2005-02-08 16:08:53 +00:00
Justin Erenkrantz
1e352ba28e * modules/cache/mod_cache.h: Move the structure declaration of cache_handle
near its typedef declaration.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151817 13f79535-47bb-0310-9956-ffa450edef68
2005-02-08 02:05:05 +00:00
Justin Erenkrantz
268fba842f * modules/cache/mod_cache.c: One more try at proper handling of revalidated
responses.

...All together now, we hate uninitialized variables...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151816 13f79535-47bb-0310-9956-ffa450edef68
2005-02-08 02:03:47 +00:00
Justin Erenkrantz
3846ec8b48 * modules/cache/mod_disk_cache.c: Properly load cached ETag from on-disk
structures.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151815 13f79535-47bb-0310-9956-ffa450edef68
2005-02-08 02:01:46 +00:00