1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-25 10:59:28 +03:00
Commit Graph

437 Commits

Author SHA1 Message Date
Jim Jagielski
08c97ba290 No functional change: remove "internal" tab spacing/formatting.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345053 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 16:31:25 +00:00
Jim Jagielski
b72e610410 No functional change: more indenting/formatting changes due to
tabbing


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332316 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 16:03:23 +00:00
Jim Jagielski
5061d9fa92 No functional Change: Removing trailing whitespace. This also
means that "blank" lines consisting of just spaces or
tabs are now really blank lines


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332306 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 15:11:44 +00:00
Jim Jagielski
5d2fae4818 No functional change: simple detabbing of indented code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332305 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 15:05:51 +00:00
Ian Holsman
8c1e315d3f Doxygen fixup / cleanup
submited by: Neale Ranns neale ranns.org
reviewed by: Ian Holsman



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@263931 13f79535-47bb-0310-9956-ffa450edef68
2005-08-28 23:03:59 +00:00
Bill Stoddard
7936e9161a Win32: Eliminate useless debug error message
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160209 13f79535-47bb-0310-9956-ffa450edef68
2005-04-05 19:01:09 +00:00
Allan K. Edwards
e807f6b3c3 Fix Windows CompContext buff size miscalculation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@158685 13f79535-47bb-0310-9956-ffa450edef68
2005-03-22 21:50:54 +00:00
Bill Stoddard
8af9f738b1 Win32: Init the args to mpm_service_install(). Prevents nasty things like segfaults
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@155833 13f79535-47bb-0310-9956-ffa450edef68
2005-03-01 22:38:04 +00:00
Bill Stoddard
14aff882b6 Win32: output some useful debug messages when installing the service
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@154322 13f79535-47bb-0310-9956-ffa450edef68
2005-02-18 17:05:29 +00:00
Bill Stoddard
5590c522d6 Win32: Move call of mpm_service_install to rewrite_args hook but continue thru post_config to check httpd.conf
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@154319 13f79535-47bb-0310-9956-ffa450edef68
2005-02-18 16:31:06 +00:00
William A. Rowe Jr
fc979108b0 Fix some symbols which should -not- be exported, and decorate real_exit_code
with ap_ (this symbol must be exported.)  If the others were desired to be
  public, they should have been ap_xxx decorated.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@154216 13f79535-47bb-0310-9956-ffa450edef68
2005-02-18 00:00:37 +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
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
06836908ad Eliminate a very ugly race - the parallel starting threads were picking
up thread identifiers other than their own.  Because the limit of threads
  is an int, stuffing the int into the void* value is a safe argument
  convention.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@123899 13f79535-47bb-0310-9956-ffa450edef68
2005-01-02 20:18:58 +00:00
William A. Rowe Jr
8f4105e37a If thread_num is long, this better be an %ld
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106653 13f79535-47bb-0310-9956-ffa450edef68
2004-11-26 20:10:41 +00:00
Allan K. Edwards
500d117c15 parm cast should be DWORD
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105394 13f79535-47bb-0310-9956-ffa450edef68
2004-10-06 19:40:47 +00:00
Jeff Trawick
51de48d00a remove dead code
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105392 13f79535-47bb-0310-9956-ffa450edef68
2004-10-06 14:23:15 +00:00
Allan K. Edwards
ec66d358ff clarify select() usage on Windows
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105391 13f79535-47bb-0310-9956-ffa450edef68
2004-10-06 13:49:19 +00:00
Allan K. Edwards
4abcf93fc2 WIN64: fix some windows specific 64bit warnings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105390 13f79535-47bb-0310-9956-ffa450edef68
2004-10-06 13:33:29 +00:00
Allan K. Edwards
b6d4b30466 WIN64: SOCKET is not int on 64bit platforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105386 13f79535-47bb-0310-9956-ffa450edef68
2004-10-05 21:04:19 +00:00
Allan K. Edwards
ba4d908410 WIN64: first in a series to get Windows IA64 builds clean, this serves pages
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105257 13f79535-47bb-0310-9956-ffa450edef68
2004-09-22 18:21:30 +00:00
Bill Stoddard
45aeb83543 Win32: Fix stranded piped loggers on apache -k start,restart,config,install
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104799 13f79535-47bb-0310-9956-ffa450edef68
2004-08-25 14:47:18 +00:00
Jeff Trawick
eec68b03fb WinNT MPM: Fix a broken log message at termination.
PR: 28063
Submitted by: Eider Oliveira <eider bol.com.br>
Reviewed by: Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104652 13f79535-47bb-0310-9956-ffa450edef68
2004-08-14 10:57:13 +00:00
Allan K. Edwards
a0a0e7e13c Prevent Win32 pool corruption at startup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103588 13f79535-47bb-0310-9956-ffa450edef68
2004-05-03 22:22:50 +00:00
André Malo
892380b0e3 disable the use of acceptex on Win9x systems automatically
PR: 28529


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103492 13f79535-47bb-0310-9956-ffa450edef68
2004-04-24 11:23:14 +00:00
Jeff Trawick
c940ea5b58 use existing directive name ThreadStackSize instead of
WorkerStackSize

as made obvious by: Brad Nicholes


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102975 13f79535-47bb-0310-9956-ffa450edef68
2004-03-15 23:08:41 +00:00
Jeff Trawick
cb5c3dd6fd Threaded MPMs for Unix and Win32: Add WorkerStackSize directive
to override default thread stack size for threads which handle
client connections.  Required for some third-party modules on
platforms with small default thread stack size.

This is also useful for trimming back the stack size on
platforms with relatively large default stack size in order to
conserve address space for supporting more threads per child.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102931 13f79535-47bb-0310-9956-ffa450edef68
2004-03-11 03:57:50 +00:00
Bill Stoddard
11b03c4294 Win32: Tweak worker thread accounting to fix hang when number of Listen directives is >= ThreadsPerChild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102922 13f79535-47bb-0310-9956-ffa450edef68
2004-03-10 15:05:52 +00:00
Allan K. Edwards
825da2b83e enable IPv6 for Windows XP and 2003. In addition this this
we need a way to set APR_HAVE_IPV6 at build time in apr.hw


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102833 13f79535-47bb-0310-9956-ffa450edef68
2004-03-01 15:55:54 +00:00
Bill Stoddard
178a03ca41 Win32: Taking down the child process on accept errors opens the possibility of a DoS attack.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102827 13f79535-47bb-0310-9956-ffa450edef68
2004-02-29 16:19:18 +00:00
Bill Stoddard
547f7e0f1d Win32: find_read_listeners was not correctly handling multiple listeners on the Win32DisableAcceptEx path
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102823 13f79535-47bb-0310-9956-ffa450edef68
2004-02-29 13:47:02 +00:00
Bill Stoddard
597c839223 Win32: Log each listener thread
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102806 13f79535-47bb-0310-9956-ffa450edef68
2004-02-28 20:50:01 +00:00
Bill Stoddard
8909b0cd0a Win32: Eliminate a Sleep(100) that always occurs on certain errors on AcceptEx(). Apply err_count threshold to all AcceptEx error conditions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102805 13f79535-47bb-0310-9956-ffa450edef68
2004-02-28 19:14:12 +00:00
Bill Stoddard
7897ad5c5b Win32: Shutdown the server on critical child failures that will prevent the server from operating
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102804 13f79535-47bb-0310-9956-ffa450edef68
2004-02-28 19:02:24 +00:00
Bill Stoddard
704e03f654 directive name changed a while back
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102790 13f79535-47bb-0310-9956-ffa450edef68
2004-02-27 21:27:18 +00:00
André Malo
eeb57c17ad fix name of The Apache Software Foundation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102619 13f79535-47bb-0310-9956-ffa450edef68
2004-02-09 20:40:53 +00:00
André Malo
fa66800cdd fix copyright date according to the first check in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102586 13f79535-47bb-0310-9956-ffa450edef68
2004-02-08 13:49:07 +00:00
André Malo
4f02cb1e18 apply Apache License, Version 2.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102525 13f79535-47bb-0310-9956-ffa450edef68
2004-02-06 22:58:42 +00:00
Bill Stoddard
6ed34bc8cb Win32: Tweak Jeff's patch to correctly handle setting server state in the parent process
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102350 13f79535-47bb-0310-9956-ffa450edef68
2004-01-15 21:33:11 +00:00
Bill Stoddard
d2c0106672 Win32: Simplify. Issue message if the Win32DisableAcceptEx directive toggles the default setting of use_acceptex. Tnx Jeff.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102246 13f79535-47bb-0310-9956-ffa450edef68
2004-01-09 20:41:06 +00:00
Bill Stoddard
f99e12ed32 Win32: plug a socket handle leak on Win9x and when using Win32DisableAcceptex on NT
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102238 13f79535-47bb-0310-9956-ffa450edef68
2004-01-09 02:22:45 +00:00
André Malo
fb07607180 update license to 2004.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102135 13f79535-47bb-0310-9956-ffa450edef68
2004-01-01 13:26:26 +00:00
Jeff Trawick
5e5dcba82c add support for querying MPM state to ap_mpm_query() for the WinNT MPM
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102081 13f79535-47bb-0310-9956-ffa450edef68
2003-12-17 02:16:44 +00:00
Bill Stoddard
325fa04bb5 Win32: Rename WindowsSocketsWorkaround directive to Win32DisableAcceptEx.
Clean up code paths.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102071 13f79535-47bb-0310-9956-ffa450edef68
2003-12-15 23:19:14 +00:00
Jeff Trawick
e5e6558f9f switch to APR 1.0 other-child API
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102063 13f79535-47bb-0310-9956-ffa450edef68
2003-12-15 12:38:50 +00:00
Bill Stoddard
ee818fd08c Win32: Tweak MaxMemFree patch. Allocate ptrans specifying pchild
as the parent pool as we did prior to the MaxMemFree patch.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102025 13f79535-47bb-0310-9956-ffa450edef68
2003-12-11 02:10:29 +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
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
aa21671e13 switch to APR 1.0 API (which is still in flux)
because of the changes to the argument lists of apr_mmap_dup and apr_socket_create,
2.1-dev won't build with apr and apr-util's 0.9 branch anymore


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101154 13f79535-47bb-0310-9956-ffa450edef68
2003-09-03 19:27:12 +00:00
Bradley Nicholes
dc4cfa1640 Make sure that the global ap_max_mem_free is initialized along with the
other MPM globals whenever HTTPD is started or restarted.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101117 13f79535-47bb-0310-9956-ffa450edef68
2003-08-27 22:33:12 +00:00