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

764 Commits

Author SHA1 Message Date
Doug MacEachern
2090fa8748 adjust to apr_uri_ rename
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90361 13f79535-47bb-0310-9956-ffa450edef68
2001-08-19 16:01:05 +00:00
Graham Leggett
0862fbcad8 Fixed LDAP cleanup on graceful restarts. LDAP connections are now
cleaned up when the connection pool pool is cleaned up.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90336 13f79535-47bb-0310-9956-ffa450edef68
2001-08-18 19:18:12 +00:00
Graham Leggett
def0eda4a2 Oops - left off the apr_ldap.h file in the commit.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90323 13f79535-47bb-0310-9956-ffa450edef68
2001-08-18 16:52:02 +00:00
Jeff Trawick
3fb380d067 the 2nd parm to strstr() doesn't lose const-ness, unlike the 1st parm;
thus, AP_DEBUG flavor of strstr() should declare 2nd parm as const char *,
not char *;

this eliminates a warning in mod_ssl-land


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90235 13f79535-47bb-0310-9956-ffa450edef68
2001-08-16 18:07:06 +00:00
Ryan Bloom
56381ea946 Bump after the tag.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90217 13f79535-47bb-0310-9956-ffa450edef68
2001-08-16 14:22:04 +00:00
Ryan Bloom
a566d29be3 Bump for a 2.0.24 tag
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90216 13f79535-47bb-0310-9956-ffa450edef68
2001-08-16 14:16:47 +00:00
Jeff Trawick
c216c2184a fix some homophonic issues in comments, as well as some
mispelings found near "its" or "it's"

(helping our 4th grader with homework, couldn't help but
grep)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90173 13f79535-47bb-0310-9956-ffa450edef68
2001-08-15 21:11:59 +00:00
Jeff Trawick
2b5249df23 namespace-protect accept_lock_mech
fix a bug in the worker MPM which effectively disabled the AcceptMutex
directive


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90153 13f79535-47bb-0310-9956-ffa450edef68
2001-08-14 12:30:50 +00:00
Jeff Trawick
c8809eb467 change the name of AP_MPM_NEEDS_RECLAIM_CHILD_PROCESSES to
be more consistent with similar names added recently; this
also cleans up an #if/#ifdef discrepency


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90141 13f79535-47bb-0310-9956-ffa450edef68
2001-08-13 18:24:53 +00:00
Jeff Trawick
f29b938e84 (hopefully) get WinNT MPM to build using mpm_common.c code; a few notes:
. the selection of ap_sock_disable() is certainly ugly, but that may
  need to be cleaned up in a different manner...
. the directive functions couldn't be AP_DECLARE() if they are to be
  compatible with AP_INIT_TAKExxx(); this is an old restriction


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90138 13f79535-47bb-0310-9956-ffa450edef68
2001-08-13 16:42:13 +00:00
Jeff Trawick
3f770a03df allow non-Unix MPMs to use mpm_common.c by not automatically
building in Unix-specific code


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90137 13f79535-47bb-0310-9956-ffa450edef68
2001-08-13 15:44:00 +00:00
Ryan Bloom
8006145310 Begin to sanitize the MPM configuration directives. Now, all
MPMs use the same functions for all common MPM directives.  This
should make it easier to catch all bugs in these directives once.

Everybody should check their favorite MPM to ensure that it still
compiles, and that these directives work.  This is a big patch, and
although it looks good, and things compiled for me, that is no
garauntee that it will work on all platforms.  :-)

Submitted by:	Cody Sherr <csherr@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90132 13f79535-47bb-0310-9956-ffa450edef68
2001-08-13 04:57:35 +00:00
Ryan Bloom
8c678242ec Fix the macro expansion problem in the hook declaration.
Submitted by:	Ian Holsman <ianh@cnet.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90098 13f79535-47bb-0310-9956-ffa450edef68
2001-08-11 18:03:28 +00:00
Ryan Bloom
6e932b2870 Fix the new method code. We need to cast 1 to an apr_int64_t or it will
be treated as a 32-bit integer, and it will wrap after being shifted
32 times.
Submitted by:	Cody Sherr <csherr@covalent.net> and
		Ryan Morgan <rmorgan@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90090 13f79535-47bb-0310-9956-ffa450edef68
2001-08-11 04:04:13 +00:00
Cliff Woolley
b4c1b66642 Update httpd to reflect change with free() pointer in buckets code
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90028 13f79535-47bb-0310-9956-ffa450edef68
2001-08-08 06:04:07 +00:00
Cliff Woolley
ed1a9a7d71 Bump to 2.0.24-dev after tag
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90020 13f79535-47bb-0310-9956-ffa450edef68
2001-08-08 00:04:21 +00:00
Cliff Woolley
f8e8224f93 Bump for 2.0.23 tag
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90018 13f79535-47bb-0310-9956-ffa450edef68
2001-08-08 00:01:41 +00:00
Ryan Bloom
cf2e6a1831 Remove all warnings from the input filtering stack.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89987 13f79535-47bb-0310-9956-ffa450edef68
2001-08-07 16:19:03 +00:00
William A. Rowe Jr
5835764fc8 _THIS_ is why mod_dir wouldn't serve the results of mod_negotiation
with a query string


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89948 13f79535-47bb-0310-9956-ffa450edef68
2001-08-06 19:10:12 +00:00
William A. Rowe Jr
68eb2c2c83 The real slim shady finally stood up. This patch segregates the fast
internal redirect logic back into http_request, the next patch will
  actually fix it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89946 13f79535-47bb-0310-9956-ffa450edef68
2001-08-06 19:03:37 +00:00
William A. Rowe Jr
5f9b514613 Provide an ap_set_deprecated() fn for quick-and-dirty 'we don't do this'
entries in the command table.

  (Also fixes a nit about returning a single bit of an apr_int_64 as an int.
  Know how this group loves !! expresssions :)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89896 13f79535-47bb-0310-9956-ffa450edef68
2001-08-03 00:59:01 +00:00
Ryan Bloom
85e8fbd0e2 Add the ability to extend the methods that Apache understands
and have those methods <limit>able in the httpd.conf. It uses
the same bit mask/shifted offset as the original HTTP methods
such as M_GET or M_POST, but expands the total bits from an int to
an ap_int64_t to handle more bits for new request methods than
an int provides.
Submitted by:	Cody Sherr <csherr@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89869 13f79535-47bb-0310-9956-ffa450edef68
2001-08-02 04:25:20 +00:00
William A. Rowe Jr
96f407ace1 Thanks Jerry, this was forgotten in my tree.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89857 13f79535-47bb-0310-9956-ffa450edef68
2001-08-01 06:23:00 +00:00
William A. Rowe Jr
56cfa2cc1f The history can evaporate later... but before someone else is bit ;/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89804 13f79535-47bb-0310-9956-ffa450edef68
2001-07-30 21:32:45 +00:00
William A. Rowe Jr
0eee59792b Provide the same optimization to the dir_config structure to track
d_is_absolute, along with d_is_fnmatch.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89791 13f79535-47bb-0310-9956-ffa450edef68
2001-07-30 18:51:57 +00:00
Victor J. Orlikowski
45b321443b httpd.exp and lots of other export files are generated based on the
AP[RU]_DECLARE macros. This commit gets mod_cgid working again as a DSO on
AIX.
However, this brings up the need to look for any functions that are
available as part of the API, and AP[RU]_DECLAREing them, so things don't
blow up in DSOs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89790 13f79535-47bb-0310-9956-ffa450edef68
2001-07-30 17:55:38 +00:00
Greg Ames
96408397d3 Fix a problem where the threaded MPM stalls after restarts or segfaults.
Also prevent multiple active processes from using the same scoreboard slot.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89761 13f79535-47bb-0310-9956-ffa450edef68
2001-07-28 23:39:07 +00:00
Cliff Woolley
c095eb0b33 Bump to 2.0.23-dev after tag update
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89759 13f79535-47bb-0310-9956-ffa450edef68
2001-07-28 03:27:16 +00:00
Cliff Woolley
c8bed16dbf Bump for 2.0.22
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89758 13f79535-47bb-0310-9956-ffa450edef68
2001-07-28 03:22:56 +00:00
William A. Rowe Jr
c86f120560 Doc formatting fixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89749 13f79535-47bb-0310-9956-ffa450edef68
2001-07-27 21:01:16 +00:00
William A. Rowe Jr
26676d06d2 Proper doc style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89748 13f79535-47bb-0310-9956-ffa450edef68
2001-07-27 20:59:20 +00:00
Cliff Woolley
150d9561b4 Bump mmn for 2.0.22-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89739 13f79535-47bb-0310-9956-ffa450edef68
2001-07-26 19:02:56 +00:00
William A. Rowe Jr
5b71e358f3 Change the length of the content args to apr_off_t identifiers, and fix
mod_negotation to treat a size of -1 and indeterminate, instead of 0.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89727 13f79535-47bb-0310-9956-ffa450edef68
2001-07-26 15:53:15 +00:00
William A. Rowe Jr
ed317a04fc Cliff's most sane advise :-)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89719 13f79535-47bb-0310-9956-ffa450edef68
2001-07-25 22:38:21 +00:00
William A. Rowe Jr
c9148bcd49 This same patch is needed in mod_asis and others, I'm testing the waters
for this solution.  I'm easily convinced to choose AP_MAX_SENDFILE based
  on any reasonable argument, provided it's smaller than 2^30 :-)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89714 13f79535-47bb-0310-9956-ffa450edef68
2001-07-25 21:41:44 +00:00
William A. Rowe Jr
5b96031409 Change over to apr_strfsize() for apr_off_t file size formatting.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89713 13f79535-47bb-0310-9956-ffa450edef68
2001-07-25 21:34:15 +00:00
Cliff Woolley
8f8d186a8d Document and future-proof the dependency between apr_read_type_e and
ap_input_mode_t.  It's now safe(r) to cast from ap_read_type_e to
ap_input_mode_t.

Submitted by:	Justin Erenkrantz, Sander Striker


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89671 13f79535-47bb-0310-9956-ffa450edef68
2001-07-24 00:10:26 +00:00
William A. Rowe Jr
0d3a73e395 Downgrade non-stopper from XXX->###
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89664 13f79535-47bb-0310-9956-ffa450edef68
2001-07-23 19:02:03 +00:00
Ryan Bloom
a92e3e0532 Bump after the tag.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89626 13f79535-47bb-0310-9956-ffa450edef68
2001-07-19 21:49:41 +00:00
Ryan Bloom
c21c903e1e Bumps for the release. The tag will be moved to this version.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89625 13f79535-47bb-0310-9956-ffa450edef68
2001-07-19 21:43:38 +00:00
Greg Ames
590a1bde98 fix memory leak of apr_sockaddr_t and apr_socket_t in ap_mpm_pod_signal,
called by perform_idle_server_maintenance.

allocate & init one apr_sockaddr_t for the dummy connect at pod open time.
use a temporary subpool for the apr_socket_t


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89612 13f79535-47bb-0310-9956-ffa450edef68
2001-07-18 21:16:40 +00:00
William A. Rowe Jr
c4549d2816 Remainder of Win32 ap_create_scoreboard fooness
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89610 13f79535-47bb-0310-9956-ffa450edef68
2001-07-18 21:14:21 +00:00
Ryan Bloom
3d8f3ce64b Make scoreboard creation a hook. This allows management
modules to have access to the scoreboard at the time that it is
created, and at every restart request.
Submitted by:	Cody Sherr <csherr@covalent.net>
Reviewed by:	Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89608 13f79535-47bb-0310-9956-ffa450edef68
2001-07-18 20:45:36 +00:00
Paul J. Reder
620a48e609 Changed AP_MPMQ_MAX_DAEMONS to refer to MaxClients and
added an AP_MPMQ_MAX_DAEMON_USED to refer to the highest
daemon index actually used in the scoreboard. I also
updated the pertinent calls.

Paul J. Reder


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89604 13f79535-47bb-0310-9956-ffa450edef68
2001-07-18 20:29:00 +00:00
Jeff Trawick
db088722d7 This patch removes spaces that shouldn't be there.
It bit me when I tried to get the new make_exports
to work.  I now fixed my make_exports (will commit
patch later), so that will eat this anyway, but
it seems nicer to make this obey the coding style
rules as well.

Submitted by:	Sander Striker


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89599 13f79535-47bb-0310-9956-ffa450edef68
2001-07-18 19:38:35 +00:00
Ryan Bloom
6a04393470 Remove a couple fields from the scoreboard that aren't currently used.
If we need these, they should be added when we begin to use them.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89554 13f79535-47bb-0310-9956-ffa450edef68
2001-07-16 02:29:33 +00:00
Greg Ames
5139e492bd scratch an old itch - give lingering close its own state in the scoreboard.
clean up SERVER_ACCEPTING and SERVER_QUEUEING (never set) while I'm at it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89542 13f79535-47bb-0310-9956-ffa450edef68
2001-07-12 03:20:50 +00:00
Ryan Bloom
2843b8672e Add two functions to allow modules to access random parts of the
scoreboard.  This allows modules compiled for one MPM to access the
scoreboard, even if it the server was compiled for another MPM.

Submitted by:	Harrie Hazewinkel <harrie@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89532 13f79535-47bb-0310-9956-ffa450edef68
2001-07-10 19:00:03 +00:00
Ryan Bloom
bc6842137c We are tagged, so bump the numbers everywhere.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89519 13f79535-47bb-0310-9956-ffa450edef68
2001-07-09 02:55:35 +00:00
Ryan Bloom
815897922b Update to prepare for 2.0.20 release
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89518 13f79535-47bb-0310-9956-ffa450edef68
2001-07-09 02:51:20 +00:00