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
Bradley Nicholes
6905d3d9d5
Allow httpd on NetWare to build using either the standard socket libraries or the Winsock libraries.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161368 13f79535-47bb-0310-9956-ffa450edef68
2005-04-14 23:42:21 +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
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
Bradley Nicholes
8baaa0a27f
Fixing various compiler error when compiling against the latest version of LibC SDK
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106766 13f79535-47bb-0310-9956-ffa450edef68
2004-11-27 22:50:18 +00:00
Bradley Nicholes
289b8bfad9
Fix a typo and clean up some tab characters.
...
Submitted by: Guenter Knauf <gk@gknw.de >
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103388 13f79535-47bb-0310-9956-ffa450edef68
2004-04-14 16:58:34 +00:00
Jeff Trawick
4d8f4c26d6
*) SECURITY: CAN-2004-0174 (cve.mitre.org)
...
Fix starvation issue on listening sockets where a short-lived
connection on a rarely-accessed listening socket will cause a
child to hold the accept mutex and block out new connections until
another connection arrives on that rarely-accessed listening socket.
With Apache 2.x there is no performance concern about enabling the
logic for platforms which don't need it, so it is enabled everywhere
except for Win32. [Jeff Trawick]
(already in 2.0.49, propagating to mirrors now)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103029 13f79535-47bb-0310-9956-ffa450edef68
2004-03-19 11:16:03 +00:00
Bradley Nicholes
6065b37bca
Adapt the mpm_netware version of the ThreadStackSize directive to the common version
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103013 13f79535-47bb-0310-9956-ffa450edef68
2004-03-17 19:47:08 +00:00
Bradley Nicholes
2e0569de3d
Report the NetWare socket error since we are using native socket calls
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102986 13f79535-47bb-0310-9956-ffa450edef68
2004-03-16 02:49:15 +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
8f5cc7b5fc
fix copyright dates according to the first checkin
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102584 13f79535-47bb-0310-9956-ffa450edef68
2004-02-08 13:43:45 +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
Jean-Jacques Clar
437ecfc445
Commenting out the DBINFO define
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102487 13f79535-47bb-0310-9956-ffa450edef68
2004-02-02 22:37:52 +00:00
Jean-Jacques Clar
aa4c436cca
Adding missing parenthesis in DBINFO code
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102486 13f79535-47bb-0310-9956-ffa450edef68
2004-02-02 22:35:08 +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
Bradley Nicholes
977bc94d5b
Added mpm_state to ap_mpm_query() for the NetWare MPM
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102078 13f79535-47bb-0310-9956-ffa450edef68
2003-12-16 20:55:04 +00:00
Bradley Nicholes
8175888f1e
Fix the display of the terminate and restarting console messages
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101988 13f79535-47bb-0310-9956-ffa450edef68
2003-12-04 21:26:50 +00:00
Bradley Nicholes
d1c97e790b
Add restart and shutdown thread counters to the console display
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101902 13f79535-47bb-0310-9956-ffa450edef68
2003-11-26 18:48:56 +00:00
Cliff Woolley
ad4ef6a24c
revert my previous commit. when 2.0 and 2.1 were not in sync, i went with
...
what was in 2.0 because it was more recent, but it turns out that was
the wrong choice. reverts to 2.0 to follow
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101173 13f79535-47bb-0310-9956-ffa450edef68
2003-09-05 22:46:17 +00:00
Cliff Woolley
9042470cbe
forward-port Brad's commit to the 2.0 branch that gets rid of the
...
explicit bucket_alloc_destroy(), which is redundant
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101164 13f79535-47bb-0310-9956-ffa450edef68
2003-09-05 19:08:56 +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
Cliff Woolley
a770ae9e77
Updated the various MPM's to use the new bucket_alloc_create_ex API
...
when necessary. Which is to say that it's necessary in all cases except
for prefork, where the change to apr-util to have it use the allocator
from the pool passed in is already sufficient.
Reviewed by: Jean-Jacques Clar, Sander Striker, Brad Nicholes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101122 13f79535-47bb-0310-9956-ffa450edef68
2003-08-28 05:54:44 +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
Bradley Nicholes
05be96b865
Simplify the per-thread pool handling in the NetWare MPM
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100156 13f79535-47bb-0310-9956-ffa450edef68
2003-06-03 19:47:35 +00:00
Bradley Nicholes
c9476445d9
Make sure that bucket allocator for each worker thread is created from a thread
...
specific pool. This prevents multiple threads from trying to clean up the same
pool at the same time.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99942 13f79535-47bb-0310-9956-ffa450edef68
2003-05-20 15:15:23 +00:00
Bradley Nicholes
cb1fce485b
Need to report a select() error vs a timeout. Also avoid hogging the CPU on
...
an error.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99065 13f79535-47bb-0310-9956-ffa450edef68
2003-03-26 19:21:32 +00:00
Bradley Nicholes
7289968ef4
Fixed a small logic problem when printing out the console command help
...
Submitted by: Ulrich Neumann <U_Neumann@gne.de >
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99017 13f79535-47bb-0310-9956-ffa450edef68
2003-03-18 15:13:42 +00:00
André Malo
742af25096
finished that boring job:
...
update license to 2003.
Happy New Year! ;-))
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98573 13f79535-47bb-0310-9956-ffa450edef68
2003-02-03 17:53:28 +00:00
Bradley Nicholes
a6d627ff01
Enabled the -n parameter on NetWare to allow the administrator to rename
...
the console screen
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98535 13f79535-47bb-0310-9956-ffa450edef68
2003-01-29 17:09:50 +00:00
Bradley Nicholes
60c843a69a
Register for the SERVERDOWN event to allow Apache to shutdown gracefully
...
when the NetWare OS is shutdown
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97898 13f79535-47bb-0310-9956-ffa450edef68
2002-12-12 19:40:52 +00:00
Bradley Nicholes
de524cdd36
Force the screen to close on exit() if the -E option was specified on the
...
command line
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97647 13f79535-47bb-0310-9956-ffa450edef68
2002-11-25 17:46:26 +00:00
Bradley Nicholes
a3fc322d82
Don't hold the Apache screen open when it exits with an error if all of the error
...
messages are going to a file anyway. In other words, don't hold the screen
open if the -E <filename> command line parameter is used.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97507 13f79535-47bb-0310-9956-ffa450edef68
2002-11-13 21:14:02 +00:00
Bradley Nicholes
9ac2b41d95
Switched to the APR_STATUS_IS_XXX macros
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97207 13f79535-47bb-0310-9956-ffa450edef68
2002-10-14 18:07:15 +00:00
Bradley Nicholes
54425d0332
Don't bother destroying the memory pools and buckets for each thread at
...
during shutdown since it will all be cleaned up at termination anyway.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97067 13f79535-47bb-0310-9956-ffa450edef68
2002-10-03 00:30:54 +00:00
Bradley Nicholes
3749da13cb
Removed unnecessary pool cleanup after a restart or shutdown
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96560 13f79535-47bb-0310-9956-ffa450edef68
2002-08-28 19:56:32 +00:00
Bradley Nicholes
73f7934fd4
Hold the Apache screen open on NetWare if exit() is called for any reason
...
during initialization and configuration of the main Apache process.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96172 13f79535-47bb-0310-9956-ffa450edef68
2002-07-24 15:17:56 +00:00
William A. Rowe Jr
ed8fc9abae
http occurances to update for apr_socket_opt_get/set
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96057 13f79535-47bb-0310-9956-ffa450edef68
2002-07-15 08:05:11 +00:00
Sander Striker
62faca71e7
Add a new directive: MaxMemFree. MaxMemFree makes it possible
...
to configure the maximum amount of memory the allocators will
hold on to for reuse. Anything over the MaxMemFree threshold
will be free()d. This directive is usefull when uncommon large
peaks occur in memory usage. It should _not_ be used to mask
defective modules' memory use.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95954 13f79535-47bb-0310-9956-ffa450edef68
2002-07-04 15:20:54 +00:00
Bradley Nicholes
18ba6165fe
Re-architected the select()/accept() loop to allow all threads to rely on select() to
...
signal when data is ready rather than only allowing a single thread at a time to
be signaled by select(). This allows Apache to pull the requests off of the
listen queue as fast as winsock will allow without latency introduced by the
accept mutex.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95893 13f79535-47bb-0310-9956-ffa450edef68
2002-06-26 21:53:25 +00:00
Jim Jagielski
cb3975a65b
Now that we have the functionality in apr, we can now have 2.0's
...
startup message regarding AcceptMutex (what we are using and what
the default is) "fully" match what is present in 1.3.
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95568 13f79535-47bb-0310-9956-ffa450edef68
2002-06-07 14:08:05 +00:00
Bradley Nicholes
c92c530536
Switched to using atomic operations for tracking the active threads rather
...
than having to lock and unlock a mutex.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95458 13f79535-47bb-0310-9956-ffa450edef68
2002-05-31 22:16:04 +00:00
Sander Striker
b1d454e981
Catch up with the apr_allocator_set_owner -> apr_allocator_owner_set renames
...
in APR.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95373 13f79535-47bb-0310-9956-ffa450edef68
2002-05-30 00:21:27 +00:00
Bradley Nicholes
5176216ddc
Fixing a memory leak with the threads bucket_allocator. We were allocating
...
too much and not freeing up enough. On a thread exit the bucket and the
transaction pool need to be cleaned up. When the MPM exits, the main pool
needs to be cleaned up.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95207 13f79535-47bb-0310-9956-ffa450edef68
2002-05-21 22:00:44 +00:00
Jeff Trawick
c871b41d3c
stop using APLOG_NOERRNO in calls to ap_log_?error()
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95149 13f79535-47bb-0310-9956-ffa450edef68
2002-05-17 11:11:39 +00:00
Bradley Nicholes
61b3b73397
Readjusting how the bucket alloc is done for each worker thread. Allocate
...
the bucket once per thread rather than on every request. This change
increases our performance significantly.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94880 13f79535-47bb-0310-9956-ffa450edef68
2002-04-30 14:32:07 +00:00
Bradley Nicholes
704d15c85f
Add some additional shutdown synchronization so that we don't get the OS
...
message to force the module to unload.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94660 13f79535-47bb-0310-9956-ffa450edef68
2002-04-15 19:23:59 +00:00