summaryrefslogtreecommitdiff
path: root/server
Commit message (Collapse)AuthorAgeFilesLines
* Also add the -U and -F operators for doing subrequest lookups to ap_expr.Stefan Fritsch2011-05-141-4/+52
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1103126 13f79535-47bb-0310-9956-ffa450edef68
* Add various file existance test operators to ap_exprStefan Fritsch2011-05-141-4/+66
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1103097 13f79535-47bb-0310-9956-ffa450edef68
* Use APR_STATUS_IS_... in some more cases.Stefan Fritsch2011-05-112-3/+3
| | | | | | | | While this is not strictly necessary everywhere, it makes it much easier to find the problematic cases. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1102124 13f79535-47bb-0310-9956-ffa450edef68
* disable hook probes for our two hooks which have no argsJeff Trawick2011-05-102-3/+32
| | | | | | | Reviewed by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1101671 13f79535-47bb-0310-9956-ffa450edef68
* allow error log formatters to peek at the message formatJeff Trawick2011-05-091-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1101143 13f79535-47bb-0310-9956-ffa450edef68
* Cleanup... most don't need apr_hooks.h at all...Jim Jagielski2011-05-093-3/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1101067 13f79535-47bb-0310-9956-ffa450edef68
* use APR_STATUS_IS_TIMEUP() instead of direct comparison with APR_TIMEUP.Eric Covener2011-05-071-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1100511 13f79535-47bb-0310-9956-ffa450edef68
* Not possible; you don't declare a variable const and thenWilliam A. Rowe Jr2011-05-071-1/+1
| | | | | | maniuplate it. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1100443 13f79535-47bb-0310-9956-ffa450edef68
* fix some dead assignments found by the clang analyzerJeff Trawick2011-04-301-3/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1098162 13f79535-47bb-0310-9956-ffa450edef68
* WinNT MPM has hard-coded daemon limit of 1, not 0Jeff Trawick2011-04-261-1/+1
| | | | | | | | | trunk mod_status relies on this value for proper formatting of the workers; now we see '-' for the idle WinNT MPM workers instead of ' ' git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1096814 13f79535-47bb-0310-9956-ffa450edef68
* Add child_status hook for tracking creation/termination of MPM childJeff Trawick2011-04-258-46/+267
| | | | | | | | | | | | | | processes. Add end_generation hook for notification when the last MPM child of a generation exits. end_generation is implemented completely by core using the child_status hook run by the MPM. simple and mpmt_os2 MPMs don't currently run the child_status hook, so neither hook is invoked with those MPMs. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1096609 13f79535-47bb-0310-9956-ffa450edef68
* Add new ap_reserve_module_slots/ap_reserve_module_slots_directive API,Stefan Fritsch2011-04-252-8/+56
| | | | | | | | | | necessary if a module (like mod_perl) registers additional modules later than the EXEC_ON_READ phase. Tested by: Torsten Foertsch <torsten foertsch gmx net> git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1096569 13f79535-47bb-0310-9956-ffa450edef68
* * server/util_pcre.c (ap_regerror): Use passed-in buffer size ratherJoe Orton2011-04-201-1/+1
| | | | | | | than the size of a pointer. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1095448 13f79535-47bb-0310-9956-ffa450edef68
* The pre_config hook should return int, not apr_status_t.Stefan Fritsch2011-04-191-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1095213 13f79535-47bb-0310-9956-ffa450edef68
* Prevent segfault if DYNAMIC_MODULE_LIMIT is reachedStefan Fritsch2011-04-151-9/+9
| | | | | | | | PR: 51072 Submitted by: Torsten Förtsch <torsten foertsch gmx net> git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1092787 13f79535-47bb-0310-9956-ffa450edef68
* AP_ENABLE_V4_MAPPED with WinNT MPMJeff Trawick2011-04-121-0/+10
| | | | | | | | | | | mpm_winnt.c: Fail to compile if enabled, and add a hint about the issue to address before it will work. configure.in: Move the --enable-v4-mapped check to below the MPM logic, and default to --disable-v4-mapped if using the WinNT MPM git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1091467 13f79535-47bb-0310-9956-ffa450edef68
* add some debug logging to show more information about passing of socketsJeff Trawick2011-04-121-2/+5
| | | | | | | | | | | | | | | | | between parent and child the extra info is helpful when using a generic listener on an IPv6- enabled box when either IPV6_V6ONLY isn't defined for the APR build or httpd is built with IPv4-mapped addresses enabled in that case you'll see the parent writing one socket but the child expecting too, before it bails out with (OS 109)The pipe has been ended. : Child: Unable to read socket data from parent git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1091421 13f79535-47bb-0310-9956-ffa450edef68
* axe the cast in the call to our mpm_nt_eventlog_stderr_open()Jeff Trawick2011-04-113-4/+4
| | | | | | | by fixing the function git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1091079 13f79535-47bb-0310-9956-ffa450edef68
* match expected type of arg to StartService()Jeff Trawick2011-04-111-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1091076 13f79535-47bb-0310-9956-ffa450edef68
* don't try to shut down child if it wasn't createdJeff Trawick2011-04-091-1/+9
| | | | | | | | (or, fix warning about reference to uninitialized variable child_exit_event) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1090634 13f79535-47bb-0310-9956-ffa450edef68
* WinNT MPM: Improve robustness under heavy load.Jeff Trawick2011-04-091-9/+15
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1090621 13f79535-47bb-0310-9956-ffa450edef68
* Fix some MinGW build issues...Jeff Trawick2011-04-092-0/+8
| | | | | | | | | | | | | | | | | | | | mpm_winnt.c: MinGW doesn't currently define the Windows STACK_SIZE_PARAM_IS_A_RESERVATION symbol mpm_unix.c: Bypass all this code on Windows (too much trouble to keep it out of Makefile) mpm_common.h: Skip over definitions of functions not available on Windows to keep references out of exports.c. PR: 49535 Submitted by: John Vandenberg <jayvdb gmail.com> Minor tweaks by: trawick Other commits for this PR: r1089950, r1089951, r1089954 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1090614 13f79535-47bb-0310-9956-ffa450edef68
* fix some logging glitches in the WinNT MPM:Jeff Trawick2011-04-091-9/+17
| | | | | | | | | | | | | | | | | | the MPM's equivalent of "reached MaxClients" is now ERR instead of WARNING the message when the MPM child exits due to excessive errors is raised from ERR to CRIT the caller of mpm_get_completion_context() could log random error values (GetLastError() or rv), so solve as follows: . mpm_get_completion_context() always logs its errors . caller only logs when it is taking a rare action on such errors, and doesn't pretend to know the error code of the last such error git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1090605 13f79535-47bb-0310-9956-ffa450edef68
* log message fixes/tweaksJeff Trawick2011-04-082-7/+7
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1090412 13f79535-47bb-0310-9956-ffa450edef68
* core: Support module names with colons in loglevel configuration.Stefan Fritsch2011-04-081-1/+1
| | | | | | | Submitted by: Torsten Förtsch <torsten foertsch gmx net> git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1090369 13f79535-47bb-0310-9956-ffa450edef68
* * server/util_expr_eval.c (req_table_func): Try r->err_headers_out forJoe Orton2011-04-081-2/+8
| | | | | | | | response headers if given header is not found in r->headers_out (e.g. as with non-standard headers from CGI scripts). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1090234 13f79535-47bb-0310-9956-ffa450edef68
* hide some unused code on Win32 and NetWareJeff Trawick2011-04-071-0/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1089910 13f79535-47bb-0310-9956-ffa450edef68
* Stop explicitly including the current pid in WinNT MPM messages,Jeff Trawick2011-04-072-52/+46
| | | | | | | | as it is part of the default log format. (And these lines needed touching anyway since %d was the wrong format string.) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1089857 13f79535-47bb-0310-9956-ffa450edef68
* axe ap_registry_get_server_root(), which seems to have been unusedJeff Trawick2011-04-071-37/+0
| | | | | | | after httpd 1.3 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1089688 13f79535-47bb-0310-9956-ffa450edef68
* format string fixes:Jeff Trawick2011-04-062-8/+8
| | | | | | | DWORD is unsigned long and needs %lu instead of %d or %i git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1089659 13f79535-47bb-0310-9956-ffa450edef68
* HANDLE is PVOID which is reasonably formatted by %pp, but not by %dJeff Trawick2011-04-061-3/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1089639 13f79535-47bb-0310-9956-ffa450edef68
* can't format time_t with %d; cast this small interval time to intJeff Trawick2011-04-061-1/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1089624 13f79535-47bb-0310-9956-ffa450edef68
* Log the OS socket (int) instead of the apr_socket_t *.Jeff Trawick2011-04-061-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1089614 13f79535-47bb-0310-9956-ffa450edef68
* yank some dead code and variablesJeff Trawick2011-04-063-57/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1089605 13f79535-47bb-0310-9956-ffa450edef68
* cleanups to function signatures, prototypes, visibilityJeff Trawick2011-04-064-9/+13
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1089600 13f79535-47bb-0310-9956-ffa450edef68
* Abort if the MPM is changed across restart.Jeff Trawick2011-04-061-2/+13
| | | | | | | | | A new MPM can't be expected to manage the existing state, particularly if that includes processes from the previous generation. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1089472 13f79535-47bb-0310-9956-ffa450edef68
* Add in a configuration generation... this is independent ofJim Jagielski2011-03-312-0/+4
| | | | | | MPM gen, just in case we ever switch MPMs at a graceful ;) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1087331 13f79535-47bb-0310-9956-ffa450edef68
* Simplify the interface to ap_reclaim_child_processes() andJeff Trawick2011-03-305-32/+28
| | | | | | | | | | | | | ap_relieve_child_processes(): instead of requiring the MPM to implement an otherwise-useless hook, just use a callback function. As I don't expect third-party MPM devs are following our day to day progress, the API changes are considered part of yesterday's MMN change. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1087085 13f79535-47bb-0310-9956-ffa450edef68
* the mpm-note-child-killed hook was just for use byJeff Trawick2011-03-302-7/+2
| | | | | | | | | ap_{reclaim,relieve}_child_processes; those functions can invoke the hook directly; the function ap_mpm_note_child_killed() is useless git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1086953 13f79535-47bb-0310-9956-ffa450edef68
* the mpm-note-child-killed hook is just for state sync betweenJeff Trawick2011-03-302-15/+0
| | | | | | | | | ap_{reclaim,relieve}_child_processes() and their callers the NetWare and OS/2 MPMs don't use that git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1086948 13f79535-47bb-0310-9956-ffa450edef68
* Change the ap_cfg_getline() and ap_cfg_getc() to return an error code.Stefan Fritsch2011-03-292-143/+135
| | | | | | | | | | | | | Also: - Make ap_cfg_getline() return APR_ENOSPC if a config line is too long. - Add ap_pcfg_strerror() function to convert ap_cfg_getline's return value into a nice message. - Adjust definition of ap_configfile_t accordingly. Not bumping MMN because it has already been bumped today. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1086756 13f79535-47bb-0310-9956-ffa450edef68
* match docs for case of "ScoreBoardFile"Jeff Trawick2011-03-281-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1086297 13f79535-47bb-0310-9956-ffa450edef68
* mpm_common.c implements a handful of config directives; the Jeff Trawick2011-03-2815-90/+35
| | | | | | | | | | | | | | | | | | | | | | related state has to be re-initialized to the default values at pre-config time, but that was handled inconsistently by the MPMs, resulting in unexpected behavior when some of the directives were removed across restart move that necessary initialization from the MPMs to common code run from core's pre-config; MPMs that need to override defaults can do so by running after core's pre-config (the NetWare MPM now does that) the DEFAULT_MAX_REQUESTS_PER_CHILD compile setting wasn't useful enough to keep the simple MPM wasn't consistent in which of these directives were respected and which weren't, and that hasn't changed (see procmgr.max_requests_per_child vs. ap_max_requests_per_child) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1086293 13f79535-47bb-0310-9956-ffa450edef68
* ap_max_requests_per_child is a globalJeff Trawick2011-03-281-1/+0
| | | | | | | | (otherwise, this local one doesn't match the one used by the OS/2 child code or the MaxConnectionsPerChild directive) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1086246 13f79535-47bb-0310-9956-ffa450edef68
* some non-MPM code wants to see DEFAULT_PIDLOG, so liberate theJeff Trawick2011-03-286-31/+0
| | | | | | | | | setting from the MPM-specific mpm_default.h now visible again via httpd -V git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1086243 13f79535-47bb-0310-9956-ffa450edef68
* consolidate logic to remove the pidfile in a new API,Jeff Trawick2011-03-286-67/+27
| | | | | | | | | | ap_remove_pid(), related to existing ap_log_pid() and ap_read_pid() presumably this is useful to third-party MPMs as well git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1086224 13f79535-47bb-0310-9956-ffa450edef68
* enable DEFAULT_REL_RUNTIMEDIR on NetWare and WindowsJeff Trawick2011-03-273-14/+0
| | | | | | | | this commit is missing the Windows and NetWare build logic to copy the appropriate file to include/ap_config_layout.h git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1086073 13f79535-47bb-0310-9956-ffa450edef68
* axe unused mpm_default definitionsJeff Trawick2011-03-262-27/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1085782 13f79535-47bb-0310-9956-ffa450edef68
* SCOREBOARD_MAINTENANCE_INTERVAL is gone, except for some localJeff Trawick2011-03-264-28/+0
| | | | | | | usage within the NetWare and OS/2 MPMs. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1085780 13f79535-47bb-0310-9956-ffa450edef68
* use apr_time_from_sec() shortcutJeff Trawick2011-03-261-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1085779 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status