summaryrefslogtreecommitdiffstats
path: root/server/core.c (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Remove MPM-private stuff from conn_state_tStefan Fritsch2011-11-201-7/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204104 13f79535-47bb-0310-9956-ffa450edef68
* ap_core_translate: factor out duplicate code. no functional change.Greg Ames2011-11-151-37/+23
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1202236 13f79535-47bb-0310-9956-ffa450edef68
* end-generation hook: Fix false notification of end-of-generation forJeff Trawick2011-11-101-0/+2
| | | | | | | temporary intervals with no active MPM children. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200449 13f79535-47bb-0310-9956-ffa450edef68
* config generation # (reported by ap_state_query(AP_SQ_CONFIG_GEN):Jeff Trawick2011-11-101-1/+1
| | | | | | | | | * start at 0 instead of 1 * don't increment until after pconf cleanups run, in case a cleanup needs to check the related config generation git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200147 13f79535-47bb-0310-9956-ffa450edef68
* fix typoStefan Fritsch2011-11-091-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199528 13f79535-47bb-0310-9956-ffa450edef68
* Only init the RNG once at startup. This saves some entropy and works around ↵Stefan Fritsch2011-11-071-2/+1
| | | | | | | | | the APR bug fixed in r1198921 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1198930 13f79535-47bb-0310-9956-ffa450edef68
* Call apr_random_after_fork() manually in the child processes because the MPMsStefan Fritsch2011-11-071-8/+30
| | | | | | | | use plain fork() and not apr_proc_fork(). Also add some workaround for APR not changing the RNG state in the parent. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1198868 13f79535-47bb-0310-9956-ffa450edef68
* Add -D DUMP_RUN_CFG option to dump some configuration itemsStefan Fritsch2011-10-091-0/+38
| | | | | | | | | from the parsed (or default) config. This is useful for init scripts that need to setup temporary directories and permissions, for example if those temporary directories are located on a ram disk. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1180681 13f79535-47bb-0310-9956-ffa450edef68
* Downgrade error log messages which accompany a 404 request status from loglevelStefan Fritsch2011-10-081-3/+3
| | | | | | | | | | | | error to info. List thread at http://mail-archives.apache.org/mod_mbox/httpd-dev/201110.mbox/%3Calpine.DEB.2.00.1110041948280.664@eru.sfritsch.de%3E PR: 35768 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1180328 13f79535-47bb-0310-9956-ffa450edef68
* More cleanup: Expand tabs and some more indentation fixesStefan Fritsch2011-09-231-3/+3
| | | | | | | No functional change git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174929 13f79535-47bb-0310-9956-ffa450edef68
* Fix cut'n'paste errors: APR_DECLARE -> AP_DECLARE / part2.Guenter Knauf2011-09-171-2/+2
| | | | | | | Submitted by: NormW <normw gknw.net> git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1171850 13f79535-47bb-0310-9956-ffa450edef68
* Create wrapper API for apr_random;Stefan Fritsch2011-09-151-0/+85
| | | | | | | | | use in mod_lbmethod_heartbeat and mod_serf to - replace some needles use of apr_generate_random_bytes - remove code duplication git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1171247 13f79535-47bb-0310-9956-ffa450edef68
* Add in MaxRangeOverlaps and MaxRangeReversals to accomodateJim Jagielski2011-09-121-17/+80
| | | | | | | | more control over acceptable Range headers: See: http://trac.tools.ietf.org/wg/httpbis/trac/ticket/311 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1169756 13f79535-47bb-0310-9956-ffa450edef68
* refactor to pull setting of Accept-Ranges header into http_protocol.c whichEric Covener2011-09-081-3/+1
| | | | | | | | had been copied to other handlers. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1166663 13f79535-47bb-0310-9956-ffa450edef68
* take care of some MaxRanges feedback:Eric Covener2011-09-071-6/+23
| | | | | | | | | | * allow "none" to be expressed in config * send Accept-Ranges: none with MaxRanges none * stop accepting confusing/ambiguous "0", start accepting "unlimited". git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1166282 13f79535-47bb-0310-9956-ffa450edef68
* add MaxRanges directive institute a default limit of 200 (post-merge where Eric Covener2011-08-281-0/+17
| | | | | | | | | | applicable) Ranges before returning the complete resource. (minor mmn bump for core_dir_config addition) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1162584 13f79535-47bb-0310-9956-ffa450edef68
* Forbid some directives in .htaccess because of AllowOverrideList:Stefan Fritsch2011-08-041-0/+6
| | | | | | | | | | | | | core: AllowOverride, AllowOverrideList mod_authn_dbd: AuthDBDUserPWQuery, AuthDBDUserRealmQuery mod_authz_dbd: AuthzDBDQuery, AuthzDBDRedirectQuery mod_proxy: BalancerMember, ProxySet Adjust for use in .htaccess: mod_actions: Script git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1153687 13f79535-47bb-0310-9956-ffa450edef68
* cleanups related to new AllowOverrideList functionality:Stefan Fritsch2011-08-031-0/+11
| | | | | | | | | - add new NOT_IN_HTACCESS flag for ap_check_cmd_context() - describe the need for this in new_api_2_4.xml - forbid Define and UnDefine in .htaccess git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1153676 13f79535-47bb-0310-9956-ffa450edef68
* Adjust some messages for <If> blocks and remove some dead codeStefan Fritsch2011-08-031-8/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1153674 13f79535-47bb-0310-9956-ffa450edef68
* Add AllowOverrideList directive and documentationDaniel Ruggeri2011-07-281-0/+41
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1151654 13f79535-47bb-0310-9956-ffa450edef68
* Use ap_document_root() in ap_core_translate() to allow modules likeStefan Fritsch2011-07-271-4/+2
| | | | | | | mod_vhost_ldap let core do the name translation git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1151361 13f79535-47bb-0310-9956-ffa450edef68
* Add string valued expressions to ap_expr, do some API cleanupStefan Fritsch2011-07-021-2/+1
| | | | | | | | | | | - add possibility to have expressions that evaluate to a string and not to a boolean value - modify ap_expr_parse_cmd() interface to support this and make it more convenient to use in general - rename AP_EXPR_FLAGS_* to AP_EXPR_FLAG_* for consistency git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1142164 13f79535-47bb-0310-9956-ffa450edef68
* Introduce new function ap_get_conn_socket() to access the socket ofStefan Fritsch2011-06-131-0/+5
| | | | | | | a connection git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1135153 13f79535-47bb-0310-9956-ffa450edef68
* Introduce ap_(get|set)_core_module_config() functions/macros and use themStefan Fritsch2011-06-061-69/+53
| | | | | | | | | | | | everywhere. We know that the core module has module_index 0. Therefore we can save some pointer operations in ap_get_module_config(cv, &core_module) and ap_set_module_config(cv, &core_module, val). As these are called rather often, this may actually have some (small) measurable effect. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1132781 13f79535-47bb-0310-9956-ffa450edef68
* - Introduce concept of context prefix (which is an URL prefix)Stefan Fritsch2011-06-051-4/+43
| | | | | | | | | | | | | | | | | | | | | | | and context document root (which is the file system directory that this URL prefix is mapped to). This generalization of the document root makes it easier for scripts to create self-referential URLs and to find their files. - Expose CONTEXT_DOCUMENT_ROOT and CONTEXT_PREFIX as envvars, in mod_rewrite, and in ap_expr. - Make mod_alias and mod_userdir set the context information. - Allow to override the document root on a per-request basis. This allows mass vhosting modules to set DOCUMENT_ROOT correctly. - Make mod_vhost_alias set the per-request document root PR: 26052, 46198, 49705 Remaining tasks: - Use the context document root & prefix in mod_rewrite to make RewriteBase unneccessary in many cases. Do this without breaking compatibility. - Write docs. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1132494 13f79535-47bb-0310-9956-ffa450edef68
* - Add <ElseIf> and <Else> to complement <If> sections. These are both easierStefan Fritsch2011-06-051-17/+61
| | | | | | | | to use and more efficient than using several <If> sections. - Update <If> documentation a bit. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1132469 13f79535-47bb-0310-9956-ffa450edef68
* Use define'd names for constantsStefan Fritsch2011-06-041-5/+9
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1131463 13f79535-47bb-0310-9956-ffa450edef68
* Cleanup... most don't need apr_hooks.h at all...Jim Jagielski2011-05-091-1/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1101067 13f79535-47bb-0310-9956-ffa450edef68
* Add child_status hook for tracking creation/termination of MPM childJeff Trawick2011-04-251-0/+1
| | | | | | | | | | | | | | 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-251-0/+1
| | | | | | | | | | 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
* 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
* 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
* Add in a configuration generation... this is independent ofJim Jagielski2011-03-311-0/+3
| | | | | | 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
* 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-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | 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
* core: AllowEncodedSlashes new option NoDecode to allow encoded slashesDaniel Earl Poirier2011-03-161-3/+18
| | | | | | | | | | in request URL path info but not decode them. Change behavior of option "On" to decode the encoded slashes as 2.0 and 2.2 do. PR 35256, PR 46830. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1082196 13f79535-47bb-0310-9956-ffa450edef68
* fix some grammar mistakes, mostly in commentsJeff Trawick2011-03-121-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1080821 13f79535-47bb-0310-9956-ffa450edef68
* Create new ap_state_query() function that allows modules to determineStefan Fritsch2011-02-121-0/+15
| | | | | | | | if the current configuration run is the initial one at server startup, and if the server is started for testing/config dumping only. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1070151 13f79535-47bb-0310-9956-ffa450edef68
* * Only unset if we have a table. This can happen if undefine occurs before ↵Ruediger Pluem2011-01-211-1/+3
| | | | | | define. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1061669 13f79535-47bb-0310-9956-ffa450edef68
* Add support to set variables with the 'Define' directive. ChangeStefan Fritsch2011-01-201-30/+53
| | | | | | | | | ap_resolve_env() to look for variables defined in this way. This allows to use the variables in the config using the ${VAR} syntax known from envvar interpolation git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1061465 13f79535-47bb-0310-9956-ffa450edef68
* Move ap_resolve_env to core.c, in preparation for adding mod_define-likeStefan Fritsch2011-01-201-0/+89
| | | | | | | variable support. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1061444 13f79535-47bb-0310-9956-ffa450edef68
* Initialize the core_dir_config->sec_files and ->sec_if only if needed.Stefan Fritsch2011-01-181-8/+18
| | | | | | | This saves some memory and two apr_array_append()s per directory merge. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1060283 13f79535-47bb-0310-9956-ffa450edef68
* remove some redundant NULL assignmentsStefan Fritsch2011-01-181-13/+11
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1060255 13f79535-47bb-0310-9956-ffa450edef68
* Merge the <If> sections in a separate step ap_if_walk, after ap_location_walk.Stefan Fritsch2011-01-171-3/+22
| | | | | | | | | | | | This makes <If> apply to all requests, not only to file base requests and it allows to use <If> inside <Directory>, <Location>, and <Files> sections. The merging of <If> sections always happens after the merging of <Location> sections, even if the <If> section is embedded inside a <Directory> or <Files> section. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1059867 13f79535-47bb-0310-9956-ffa450edef68
* eliminate another var named 'c' which is not a conn_recStefan Fritsch2010-12-301-4/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1053954 13f79535-47bb-0310-9956-ffa450edef68
* Applying patch from PR 33078 (with slight changes to its return values)Igor Galić2010-12-281-1/+25
| | | | | | | This patch disallows the mixing of relative (+/-) and absolute Options where insensible. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1053375 13f79535-47bb-0310-9956-ffa450edef68
* Changing the default Options from All to FollowSymlinks.Igor Galić2010-12-241-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1052419 13f79535-47bb-0310-9956-ffa450edef68
* PR50349: Honor 'AcceptPathInfo OFF' during internal redirects,Eric Covener2010-12-071-7/+12
| | | | | | | | | | such as per-directory mod_rewrite substitutions. This would be left floating around in the request_rec with a pcalloc'ed value, so the core fixup hook thought some module had overridden it. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1043023 13f79535-47bb-0310-9956-ffa450edef68
* simplify ServerName check with apr_fnmatch_test()Eric Covener2010-12-041-10/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1042157 13f79535-47bb-0310-9956-ffa450edef68
* Remove useless 'const' to fix compiler warningStefan Fritsch2010-12-041-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1042147 13f79535-47bb-0310-9956-ffa450edef68