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

3918 Commits

Author SHA1 Message Date
Joe Orton
e2e8cc8e79 Extend mod_status output to include SSL session cache status
information:

* modules/ssl/mod_ssl.c (ssl_hook_pre_config): Call
ssl_scache_status_register.

* modules/ssl/ssl_scache.c (ssl_scache_status): Removed function.
(ssl_ext_status_hook): Renamed from ssl_ext_ms_display: switch to
2.1's mod_status "status_hook" API.
(ssl_scache_status_register): Register optional hook.

* modules/ssl/ssl_scache_dbm.c (ssl_scache_dbm_status): Adjust to use
new API.

* modules/ssl/ssl_scache_shmcb.c (ssl_scache_shmcb_status): Adjust
to use new API.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101889 13f79535-47bb-0310-9956-ffa450edef68
2003-11-25 16:59:10 +00:00
Joe Orton
9ddbb80f51 Remove shmht session cache in favour of shmcb; shmht has had
data corruption bugs since being apr_rmm'ified.

* config.m4, mod_ssl.dsp: Don't build ssl_util_table and
ssl_scache_shmht.

* ssl_util_table.h, ssl_util_table.c, ssl_scache_shmht.c: Removed
files.

* mod_ssl.h (SSLModConfigRec): Use a void * pointer for storing
the scache-specific data.

* ssl_engine_config.c (ssl_cmd_SSLSessionCache): Treat shmht: as
shmcb:.

* ssl_scache.c: Remove shmht hooks throughout.

* ssl_scache_shmcb.c: Remove casts to use the table_t * pointer as a
void *.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101888 13f79535-47bb-0310-9956-ffa450edef68
2003-11-25 15:46:37 +00:00
Joe Orton
7fa53b9905 * modules/dav/main/mod_dav.c (dav_method_copymove): For a 401 on the
destination resource, propagate the WWW-Auth header from the
subrequest back to the client.

PR: 15571


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101885 13f79535-47bb-0310-9956-ffa450edef68
2003-11-25 14:17:55 +00:00
Joe Orton
c5503f14e4 * modules/dav/main/util.c (dav_validate_resource_state): Simplify weak
etag comparison to avoid unnecessary tests and pstrdup calls.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101884 13f79535-47bb-0310-9956-ffa450edef68
2003-11-25 13:54:39 +00:00
Joe Orton
c665770e7c * modules/ssl/ssl_engine_vars.c (ssl_var_log_handler_x): Fix
unused variable from previous commit.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101881 13f79535-47bb-0310-9956-ffa450edef68
2003-11-25 13:16:10 +00:00
Joe Orton
7aa9696571 * modules/ssl/ssl_engine_vars.c (ssl_var_lookup): Only call
ssl_var_lookup_ssl for a real SSL connection; fix lookup of "HTTPS"
for non-SSL connections.
(ssl_var_log_handler_x): Give results for non-SSL connections too;
e.g. %{HTTPS}x does the right thing.

PR: 23956


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101880 13f79535-47bb-0310-9956-ffa450edef68
2003-11-25 13:10:09 +00:00
Joe Orton
5bd9d41311 * modules/ssl/ssl_engine_vars.c (ssl_var_lookup_ssl_version):
Determine the library version string at run-time rather than at
compile-time.

Submitted by: Eric Seidel <eseidel@apple.com>
PR: 23956


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101879 13f79535-47bb-0310-9956-ffa450edef68
2003-11-25 12:46:32 +00:00
Joe Orton
2c999f855a * modules/ssl/ssl_engine_init.c (ssl_init_proxy_certs): Fail early
(rather than segfault later) if a client cert is configured which is
missing either the certificate or private key.

PR: 24030


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101878 13f79535-47bb-0310-9956-ffa450edef68
2003-11-25 12:35:45 +00:00
Bradley Nicholes
8e1147717a Hook the default_port so that mod_nw_ssl will return the correct port rather
than defaulting to 80


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101872 13f79535-47bb-0310-9956-ffa450edef68
2003-11-24 20:36:55 +00:00
André Malo
416e669813 add another space, for the sake of Netscape 4
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101854 13f79535-47bb-0310-9956-ffa450edef68
2003-11-23 17:27:30 +00:00
André Malo
fcab969a38 restore the space which broke all tests :-)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101853 13f79535-47bb-0310-9956-ffa450edef68
2003-11-23 17:20:55 +00:00
Jeff Trawick
7c5b42692a switch to new pollset api
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101850 13f79535-47bb-0310-9956-ffa450edef68
2003-11-23 01:06:29 +00:00
Jeff Trawick
f07d84bc18 switch to new pollset api
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101849 13f79535-47bb-0310-9956-ffa450edef68
2003-11-23 00:37:05 +00:00
Paul J. Reder
495e6085d7 A better solution than my previous commit as pointed out by Andre Malo.
mod_expires: Initialize ExpiresDefault to NULL instead of "" to
avoid reporting an Internal Server error if it is used without
having been set in the httpd.conf file. PR: 23748, 24459
Submitted: Andre Malo, Liam Quinn  <liam htmlhelp.com>
Reviewed: Andre Malo, Paul J. Reder


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101846 13f79535-47bb-0310-9956-ffa450edef68
2003-11-22 02:11:00 +00:00
Paul J. Reder
e030a58be6 mod_expires: Don't report an Internal Server error if ExpiresDefault
is used and has not been set in the httpd.conf file. PR: 23748, 24459

Submitted: Liam Quinn  <liam htmlhelp.com>
Reviewed: Paul J. Reder


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101839 13f79535-47bb-0310-9956-ffa450edef68
2003-11-21 23:37:05 +00:00
Jeff Trawick
68ae3ab862 Fix a problem with the display of empty variables ("SetEnv foo") in
mod_include.  Now it works like 1.3 (see PR for details).  Setting
of envvars for scripts was/is consistent with 1.3 for empty variables.

PR:           24734
Submitted by: Markus Julen <mj zermatt.net>
Reviewed by:  Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101830 13f79535-47bb-0310-9956-ffa450edef68
2003-11-21 03:49:12 +00:00
Ian Holsman
b8f83d01ae mod_autoindex: new directive IndexStyleSheet
PR:
Obtained from:
Submitted by: Tyler Riddle <triddle_1999 yahoo.com> and Paul Querna <chip force-elite.com>
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101809 13f79535-47bb-0310-9956-ffa450edef68
2003-11-20 03:45:22 +00:00
Justin Erenkrantz
c02dcf4c02 Sync with APR-util deprecated functions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101789 13f79535-47bb-0310-9956-ffa450edef68
2003-11-16 02:22:25 +00:00
Cliff Woolley
aaf0424e2b get rid of _FOREACH
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101788 13f79535-47bb-0310-9956-ffa450edef68
2003-11-16 02:09:14 +00:00
Jeff Trawick
c9eb9be474 stop using deprecated apr_atomic functions
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101786 13f79535-47bb-0310-9956-ffa450edef68
2003-11-16 01:51:28 +00:00
Jeff Trawick
32044c1ca5 fix the EBCDIC path in send_all_header_fields() to actually return something
the caller ignores it, but still...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101784 13f79535-47bb-0310-9956-ffa450edef68
2003-11-15 21:42:17 +00:00
Bradley Nicholes
ed6284991a Updated the latest LDAP cache changes to support platforms that do not have
shared memory.  All shared memory patches must respect the
APR_HAS_SHARED_MEMORY #define.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101750 13f79535-47bb-0310-9956-ffa450edef68
2003-11-11 19:10:56 +00:00
André Malo
345df1e0fd style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101744 13f79535-47bb-0310-9956-ffa450edef68
2003-11-10 21:27:45 +00:00
André Malo
a4ef421fa7 re-add explaining comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101730 13f79535-47bb-0310-9956-ffa450edef68
2003-11-09 20:05:06 +00:00
André Malo
60f4a2189b allow any user id when configured with 'anonymous *'
PR: 11428


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101728 13f79535-47bb-0310-9956-ffa450edef68
2003-11-09 18:21:51 +00:00
André Malo
9583ac39c8 less confusion with identifiers && style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101727 13f79535-47bb-0310-9956-ffa450edef68
2003-11-09 18:02:26 +00:00
Jeff Trawick
c76efd6bfb Fix a long delay with CGI requests and keepalive connections on
AIX.

On AIX, for processes like mod_cgid's script children where
SIGCHLD is ignored, kill(pid,0) returns success for up to
one second after the script child exits, based on when a
daemon runs to clean up unnecessary process table entries.
getpgid() can report the proper info (-1/ESRCH) immediately.

One user had a page with a lot of embedded images created by
CGIs, and the browser fetched them on a keepalive connection,
and the cumulative delays were very noticeable by the clients.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101716 13f79535-47bb-0310-9956-ffa450edef68
2003-11-07 15:26:34 +00:00
Jeff Trawick
f5552b336d fix another segfault condition in ldap cache code
PR:              18756
Submitted by:	 Matthieu Estrade
Reviewed by:	 Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101712 13f79535-47bb-0310-9956-ffa450edef68
2003-11-07 10:49:35 +00:00
Bradley Nicholes
292386ac9a Allow translation of generated output such as mod_autoindex using charsets
other than EBCDIC.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101708 13f79535-47bb-0310-9956-ffa450edef68
2003-11-07 01:01:27 +00:00
Jeff Trawick
81abe56f16 mod_auth_ldap: Fix some segfaults in the cache logic.
PR:                18756
Submitted by:      Matthieu Estrade <apache@moresecurity.org>
Reviewed by:       Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101706 13f79535-47bb-0310-9956-ffa450edef68
2003-11-06 20:45:56 +00:00
Joe Orton
3be85f7869 * modules/loggers/mod_log_config.c (log_request_time): Log
the minutes component of the timezone correctly.

PR: 23642
Submitted by: Hong-Gunn Chew <hgbug@gunnet.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101703 13f79535-47bb-0310-9956-ffa450edef68
2003-11-05 17:16:00 +00:00
André Malo
256c57f350 darn, the patch for bug 9587 (wrong icon for directories shown) broke
the directory descriptions more or less completely. Fix it now.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101693 13f79535-47bb-0310-9956-ffa450edef68
2003-11-03 21:57:51 +00:00
André Malo
2578a599c9 no longer allow an ETag header in 304 responses.
PR: 19355
Submitted by: Geoffrey Young <geoff@apache.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101687 13f79535-47bb-0310-9956-ffa450edef68
2003-11-02 22:09:19 +00:00
André Malo
1694aa9b06 - add XHTML doctypes to httpd.h
- fix the (x)html output of mod_autoindex to be consistent
  and make it configurable to emit either HTML or XHTML

PR: 23747


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101683 13f79535-47bb-0310-9956-ffa450edef68
2003-11-02 20:37:04 +00:00
André Malo
be807cff9a add a comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101678 13f79535-47bb-0310-9956-ffa450edef68
2003-11-02 12:21:33 +00:00
André Malo
c906fa96c9 fix optimizer to not throw away a regex if it stumbles over it.
PR: 24219


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101665 13f79535-47bb-0310-9956-ffa450edef68
2003-11-02 00:36:08 +00:00
Astrid Malo
fb2802c75b improve some module descriptions
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101664 13f79535-47bb-0310-9956-ffa450edef68
2003-11-02 00:04:47 +00:00
André Malo
72ff650b79 Don't omit the initial <tr> if SuppressIcon is set.
Submitted by: Jesse Tie-Ten-Quee <highos@highos.com>
PR: 21668


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101661 13f79535-47bb-0310-9956-ffa450edef68
2003-11-01 23:00:25 +00:00
André Malo
4c3949e8b9 improve readability a (little) bit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101657 13f79535-47bb-0310-9956-ffa450edef68
2003-11-01 22:06:28 +00:00
Thom May
63abfc7538 * modules/generators/mod_info.c:
(mod_info_module_cmds) ap_escape_html() all directives and
        arguments.
PR: 24232


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101626 13f79535-47bb-0310-9956-ffa450edef68
2003-10-30 16:43:45 +00:00
Joe Orton
1a97fbae07 * ssl_engine_log.c (ssl_log_ssl_error): Use the thread-safe
interface for retrieving error strings.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101625 13f79535-47bb-0310-9956-ffa450edef68
2003-10-30 12:15:28 +00:00
Joe Orton
ae0cef9c80 Fix missing human-readable error information in SSL log messages:
* mod_ssl.c (ssl_cleanup_pre_config): Don't free the error strings,
since they can't be loaded again once.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101624 13f79535-47bb-0310-9956-ffa450edef68
2003-10-30 12:07:06 +00:00
Jeff Trawick
468254b6b0 mod_status: Report total CPU time accurately when using a threaded
MPM.

Note: It worked before with linuxthreads and it still does.  But now
it works with normal thread implementations too.

PR:     23795


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101614 13f79535-47bb-0310-9956-ffa450edef68
2003-10-29 20:56:28 +00:00
Sander Striker
3e4547ab87 Forward port from 2.0:
SECURITY [CAN-2003-0789]: mod_cgid: Resolve some mishandling of
the AF_UNIX socket used to communicate with the cgid daemon and
the CGI script.

Submitted by: Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101570 13f79535-47bb-0310-9956-ffa450edef68
2003-10-26 23:25:44 +00:00
Sander Striker
67a3a71877 Fold in the CAN-2003-0542 regex patch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101556 13f79535-47bb-0310-9956-ffa450edef68
2003-10-24 16:20:28 +00:00
Joe Orton
0917d6edc8 * modules/ssl/ssl_engine_vars.c (ssl_var_log_handler_c): Fix
segfault on a non-SSL request.

PR: 22741
Submitted by: Gary E. Miller <gem@rellim.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101534 13f79535-47bb-0310-9956-ffa450edef68
2003-10-23 13:12:38 +00:00
Jeff Trawick
0c3c5b7145 Set the scoreboard state to indicate logging prior to running
logging hooks so that server-status will show 'L' for hung loggers
instead of 'W'.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101517 13f79535-47bb-0310-9956-ffa450edef68
2003-10-22 16:45:53 +00:00
Joe Orton
41d4a3c58a * proxy_http.c (ap_proxy_http_process_response): Send a valid
status-line even if the parsed status-line had no trailing spaces.
Remove the warning for this case as triggers for valid status-lines
too.

PR: 23998


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101516 13f79535-47bb-0310-9956-ffa450edef68
2003-10-22 16:09:58 +00:00
Joe Orton
bc1c3f3d88 Fix a cosmetic issue where OpenSSL 0.9.7 will dump the error stack
during pass phrase entry.

* ssl_engine_pphrase.c (ssl_pphrase_Handle): Clear the OpenSSL error
stack before reading the private key.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101515 13f79535-47bb-0310-9956-ffa450edef68
2003-10-22 15:04:11 +00:00
André Malo
57135abe5c fix segfault which occured if the filename was not
set, for example, when processing some error conditions.

PR: 23836


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101461 13f79535-47bb-0310-9956-ffa450edef68
2003-10-15 22:55:48 +00:00