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

12182 Commits

Author SHA1 Message Date
Jeff Trawick
fc60a9086a remove references to Irix uslock() mutex primitive
tweak mutex mechanism descriptions to describe them in terms of
AcceptMutex directive instead of ancient 1.3-style CFLAGS for
enabling to the mechanism

PR:         24228


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101897 13f79535-47bb-0310-9956-ffa450edef68
2003-11-26 02:56:22 +00:00
Jeff Trawick
6c300dd034 The caller of ap_pass_brigade() relinquishes ownership of the brigade.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101895 13f79535-47bb-0310-9956-ffa450edef68
2003-11-26 02:12:49 +00:00
Jeff Trawick
1dc6636640 tidy up some charset recoding issues
the "need" for APACHE_XLATE went away some years ago when BUFF went
POOF and charset recoding (translation) of non-protocol data
could no longer be performed by the core...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101894 13f79535-47bb-0310-9956-ffa450edef68
2003-11-26 02:09:25 +00:00
Paul J. Reder
91aa761bab Sync with APACHE_2_0_BRANCH.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101891 13f79535-47bb-0310-9956-ffa450edef68
2003-11-25 17:53:25 +00:00
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
fafb5fe959 * buildconf: Ensure that make never regenerates the mod_ssl expression
parser files from the lex/yacc sources.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101886 13f79535-47bb-0310-9956-ffa450edef68
2003-11-25 15:21:46 +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
1ee83b9da2 Regenerate man pages.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101883 13f79535-47bb-0310-9956-ffa450edef68
2003-11-25 13:37:31 +00:00
Joe Orton
8be2217e83 - use .SS not .Sh for subheadings, and don't capitalize them
- don't indent <dl> lists


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101882 13f79535-47bb-0310-9956-ffa450edef68
2003-11-25 13:36:31 +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
André Malo
a7db87b9ad SECURITY [CAN-2003-0020]: escape arbitrary data before writing into the
errorlog.

Reviewed by: Mark J Cox


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101873 13f79535-47bb-0310-9956-ffa450edef68
2003-11-24 21:34:38 +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
Cliff Woolley
e269230c3b fix comment
Submitted by:	Fitz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101870 13f79535-47bb-0310-9956-ffa450edef68
2003-11-24 16:08:44 +00:00
Brian Pane
79a3c0c99b remove calls to the apr_proc_other_child_read function that no longer exists
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101858 13f79535-47bb-0310-9956-ffa450edef68
2003-11-24 01:34:04 +00:00
Astrid Malo
b0abaae6bf Several improvements:
- some better descriptions
- reorder the enable/disable module options
- add --with-dbm options
- some nits

note: this is 2.0. changes in 2.1, e.g. auth modules, are still missing


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101857 13f79535-47bb-0310-9956-ffa450edef68
2003-11-23 23:07:26 +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
Astrid Malo
26c2134590 add a note about the spelling of options
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101851 13f79535-47bb-0310-9956-ffa450edef68
2003-11-23 02:50:48 +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
Jeff Trawick
0f5ba4e44d build with latest other-child API changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101848 13f79535-47bb-0310-9956-ffa450edef68
2003-11-22 20:43:25 +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
André Malo
86cf5be6dc sync
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101845 13f79535-47bb-0310-9956-ffa450edef68
2003-11-21 23:53:36 +00:00
Bradley Nicholes
251c9e7b21 Stop trying to copy headers out of directories that don't exist
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101843 13f79535-47bb-0310-9956-ffa450edef68
2003-11-21 23:46:25 +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
ffd07ca67c Account for some bytes handed to the network layer prior to
dropped connections.

Such bytes were counted on some paths but not on others.  If
these bytes are to be counted in some error paths, they should
be counted in the others.  We don't know if they were actually
presented to the client.

AFAIK, this only affects mod_logio.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101832 13f79535-47bb-0310-9956-ffa450edef68
2003-11-21 15:02:04 +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
Jeff Trawick
26c3384089 axe a comment... as with so many things, the true part isn't
interesting and the interesting part isn't true


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101829 13f79535-47bb-0310-9956-ffa450edef68
2003-11-21 03:29:11 +00:00
Jeff Trawick
6159e9455c simplify just a bit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101828 13f79535-47bb-0310-9956-ffa450edef68
2003-11-21 03:26:14 +00:00
Brian Havard
eeb0224f02 Rework OS/2 MPM to use the pollset API.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101826 13f79535-47bb-0310-9956-ffa450edef68
2003-11-20 22:28:15 +00:00
Jeff Trawick
0beaea8979 spell check
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101822 13f79535-47bb-0310-9956-ffa450edef68
2003-11-20 21:31:59 +00:00
Bill Stoddard
a2d1b5215b Win32: MaxMemFree works with mpm_winnt
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101820 13f79535-47bb-0310-9956-ffa450edef68
2003-11-20 20:12:13 +00:00
Jeff Trawick
ac2bc5da94 sync with stable branch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101819 13f79535-47bb-0310-9956-ffa450edef68
2003-11-20 19:53:14 +00:00
Bill Stoddard
c5b8379591 Win32: Make Win32 MPM transaction pools honor MaxMemFree
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101817 13f79535-47bb-0310-9956-ffa450edef68
2003-11-20 19:44:18 +00:00
Joshua Slive
0884e90853 Reference the bug database in the STATUS file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101813 13f79535-47bb-0310-9956-ffa450edef68
2003-11-20 16:12:28 +00:00
David Shane Holden
de9f35b5b4 Fix a few typos and change the description a bit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101810 13f79535-47bb-0310-9956-ffa450edef68
2003-11-20 05:17:54 +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
Astrid Malo
cb9e2e9e19 improve this document step by step:
- use --enable-layout description from install.xml

further contributions and comments are welcome


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101805 13f79535-47bb-0310-9956-ffa450edef68
2003-11-17 22:28:17 +00:00
Rich Bowen
4ae7189b5f Unless anyone strenuously objects, I'm adding back the comments
regarding ScriptInterpreterSource. We're getting an increasing number of
questions about this.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101802 13f79535-47bb-0310-9956-ffa450edef68
2003-11-17 01:33:11 +00:00
Greg Stein
0ea3a6ccd9 Switch over to the new pollset API.
* server/mpm/worker/worker.c:
  (listener_thread): create and add sockets to the pollset using the new
    APIs. rearrange the round-robin a little bit to work with the new
    pollset return values.
    cleaning: get rid of an extraneous status variable. get rid of
      obsoleted round-robin code.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101801 13f79535-47bb-0310-9956-ffa450edef68
2003-11-16 23:47:07 +00:00
Greg Stein
6ff23b5f80 Switch the prefork MPM over to the new pollset interface.
* server/mpm/prefork/prefork.c:
  (listensocks[]): removed. not required.
  (child_main): stop using listensocks[] in favor of an apr_pollset_t. if
    there is just one listener, then always refer to that listener's
    listen_rec for further processing, otherwise poll and pick up the
    listen_rec pointer from the polling structure's client_data. tweaked
    the round-robin for the new pollset API (and documented).
    cleaning: removed 'offset' which is obviated by the use of a pointer
      to a listen_rec. tighten the block-scope of several variables.
      switch to use a 'status' variable name rather than three separately
      named variables. rename n->numdesc to be more obvious.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101799 13f79535-47bb-0310-9956-ffa450edef68
2003-11-16 23:03:18 +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