www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Code Activity
15,273 Commits 62 Branches 313 Tags
fips-dev
Commit Graph

1312 Commits

Author SHA1 Message Date
Paul Querna
e1955172ab * event.c: Create ptrans pool as a child of pconf, to fix APR pool 
lifetime checks in apr_tables.c.

Based on r170896 changes to the Worker MPM.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@179355 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-01 05:00:29 +00:00
Jeff Trawick
002ca1448b downgrade the log level of a proc_mutex_unlock error message 
when it occurs during restart; it isn't at all uncommon then
when SysV semaphores are used for the accept mutex

same logic already in place for two other mutex calls


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@179317 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-31 23:57:41 +00:00
Joe Orton
9d9b45ae5c * server/mpm/worker/worker.c (listener_thread): Create ptrans pool as 
a child of pconf, to fix APR pool lifetime checks in apr_tables.c.

Submitted by: Joe Schaefer


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170896 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-19 09:01:22 +00:00
Greg Ames
e06eaebac5 missed a couple. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@168649 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-06 20:37:05 +00:00
Paul Querna
3bce42b631 Remove this old email from the source tree. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@168496 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-06 02:26:26 +00:00
Greg Ames
5ceb57af0d worker and event mpms: transient thread creation errors shouldn't take down 
the whole server.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@168182 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-04 20:00:23 +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
Greg Ames
20b9c89da5 the style police have been sleeping 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160211 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-05 19:45:32 +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
Paul Querna
1fe9d2eba8 sync with mod_status hacks in the worker mpm. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@157810 13f79535-47bb-0310-9956-ffa450edef68
 2005-03-16 21:48:57 +00:00
Paul Querna
49ff90cbe3 Add ap_mpm_is_experimental and ap_mpm_is_threaded. Use these instead of checking for specific MPMs. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@156574 13f79535-47bb-0310-9956-ffa450edef68
 2005-03-08 22:40:33 +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
Jeff Trawick
3e14f16867 worker MPM/mod_status: Support per-worker tracking of pid and 
generation in the scoreboard so that mod_status can accurately
represent workers in processes which are gracefully terminating.

New child processes with worker MPM can take over slots of
individual threads within gracefully terminating processes.
Sometimes this is a problem (too many of these gracefully
terminating processes), so it is helpful to have mod_status
provide the information required to recognize these processes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@156274 13f79535-47bb-0310-9956-ffa450edef68
 2005-03-05 20:06:55 +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
Greg Ames
1192058be2 ap_queue_push: update comment to reflect reality 
pointed out by: Ron Park (ronp cnet.com)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@111385 13f79535-47bb-0310-9956-ffa450edef68
 2004-12-09 14:11:29 +00:00
Justin Erenkrantz
779e530a5c * server/mpm/experimental/event/event.c: Go through and reformat and correct 
comments to be more appropriate.

*no functional changes*


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@109773 13f79535-47bb-0310-9956-ffa450edef68
 2004-12-04 05:25:57 +00:00
Greg Ames
7be370590c fix child process aborts with 
assertion "!((queue)->nelts == (queue)->bounds)" failed
due to worker queue overflows. The listener/event thread
needs to block when all worker threads are busy.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@109631 13f79535-47bb-0310-9956-ffa450edef68
 2004-12-03 05:28:00 +00:00
Jeff Trawick
592750b026 worker MPM: Fix a problem which could cause httpd processes to 
remain active after shutdown.

The problem occurred when a scoreboard entry currently
in use by an exiting child process was used for a new child
process.  At that point, the MPM forgot about the exiting
child process, so ap_reclaim_child_processes() wouldn't be
able to forceably terminate it.

(An exiting child process may *never* exit due to a stuck
or long-running request being handled on one of the threads.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@109510 13f79535-47bb-0310-9956-ffa450edef68
 2004-12-02 17:39:22 +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
Greg Ames
895bdde8f8 listener_thread: no functional changes, formatting changes only 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106744 13f79535-47bb-0310-9956-ffa450edef68
 2004-11-27 19:33:21 +00:00
Greg Ames
4c448acc3a only need one main listener loop. 
logic changes only to minimize diff.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106743 13f79535-47bb-0310-9956-ffa450edef68
 2004-11-27 19:29:26 +00:00
Greg Ames
5f83105351 make the type field in listener_poll_type an enum to make gdb output more 
useful.

add a comment about a field I haven't been able to grok yet.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106674 13f79535-47bb-0310-9956-ffa450edef68
 2004-11-27 00:37:54 +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
Paul Querna
34959f29db The Event MPM. 
Designed to minimize Apache's KeepAlive overhead.

This MPM depends on the current APR-trunk for new features added to 
the apr_pollset interface. Currently the underlying operating
system must support KQueue or EPoll.

Status:
  Should work as a drop in replacement for all non-ssl servers.
  SSL Requests that use HTTP 1.1 Pipelining do not currently work.

Testing:
  I have tested it with Linux 2.6, FreeBSD 5.2.1, and OS X 10.3.
  
Originally based on the patch by Greg Ames.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105919 13f79535-47bb-0310-9956-ffa450edef68
 2004-11-20 02:52:36 +00:00
Joe Orton
c36ecfa64f Remove the .cvsignore files. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105796 13f79535-47bb-0310-9956-ffa450edef68
 2004-11-19 09:07:29 +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
Joe Orton
d2e2c4e584 * modules/ssl/ssl_engine_kernel.c (ssl_callback_SSLVerify_CRL), 
* server/log.c (ap_log_pid),
* server/mpm/prefork/prefork.c (accept_mutex_on, accept_mutex_off),
* support/htdbm.c (htdbm_list):
Fix some non-literal format strings (warnings from gcc -Wformat-security).

PR: 30585
Submitted by: Ulf Harnhammar (SITIC), Joe Orton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104548 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-11 14:25:30 +00:00
Jeff Trawick
6ca160f41f perchild MPM: Fix thread safety problem in the use of longjmp(). 
Submitted by:   Tsuyoshi SASAMOTO <nazonazo super.win.ne.jp>
Reviewed by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104436 13f79535-47bb-0310-9956-ffa450edef68
 2004-07-31 20:47:49 +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
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
André Malo
aeed109950 the eight space tabs are harassing me. 
:set tabstop=8
:retab
(no code changes)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103348 13f79535-47bb-0310-9956-ffa450edef68
 2004-04-11 23:55:10 +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
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