summaryrefslogtreecommitdiffstats
path: root/include/http_config.h (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Include header file for the explicit regex.Graham Leggett2023-04-141-6/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1909136 13f79535-47bb-0310-9956-ffa450edef68
* Resolves BZ65861 - clarify post_config api docRich Bowen2022-02-231-0/+10
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1898347 13f79535-47bb-0310-9956-ffa450edef68
* Define ap_method_mask_t (typedef for apr_uint64_t) and use for methodJoe Orton2020-02-171-1/+1
| | | | | | | | | | | | | | | | | | bitmasks rather than apr_int64_t. Fixes UBSan errors shifting to the top bit of a signed integer. * include/httpd.h: Add ap_method_mask_t, use it for AP_METHOD_BIT. (struct ap_method_mask_t): Likewise for method_mask field. (struct request_rec): Likewise for allowed field. * include/http_config.h (struct cmd_parms): Likewise for limited field. * include/ap_mmn.h: Bump MMN major. * modules/*/*.c: Adjust all method masks to use ap_method_mask_t. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1874114 13f79535-47bb-0310-9956-ffa450edef68
* Fix spelling errors found by codespell. [skip ci]Mike Rumph2020-02-131-3/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1873985 13f79535-47bb-0310-9956-ffa450edef68
* core: Split out the ability to parse wildcard files and directoriesGraham Leggett2018-11-251-0/+15
| | | | | | | | from the Include/IncludeOptional directives into a generic set of functions ap_dir_nofnmatch() and ap_dir_fnmatch(). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1847430 13f79535-47bb-0310-9956-ffa450edef68
* Define "state directory" for storing persistent child-writable state,Joe Orton2018-10-051-0/+8
| | | | | | | | | | | | | | | | | | with default from config.layout, configurable via DefaultStateDir. * server/core.c (set_state_dir, ap_state_dir_relative): New functions. * config.layout, acinclude.m4, Makefile.in, configure.in: Define statedir variables, drop davlockdb. * include/ap_config_layout.h.in: Define DEFAULT_REL_STATEDIR, DEFAULT_EXP_STATEDIR in place of _DAVLOCKDB. * include/ap_mmn.h: Bump MMN minor. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1842929 13f79535-47bb-0310-9956-ffa450edef68
* Fix some typos reported in PR 59998Christophe Jaillet2018-03-241-1/+1
| | | | | | | | Most add already been fixed when PR 59990 had been applied on trunk. Thx klemens git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1827669 13f79535-47bb-0310-9956-ffa450edef68
* Follow up to r1740928: including NOT_IN_PROXY in NOT_IN_DIR_LOC_FILE is bothYann Ylavic2017-10-141-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | incomplete and not backportable, fix it by introducing NOT_IN_DIR_CONTEXT and restoring NOT_IN_DIR_LOC_FILE to its previous value. Per ap_check_cmd_context(), NOT_IN_DIR_LOC_FILE actually/really means "not in any directory context", while the definition itself does not include all the existing directory contexts (e.g. <Limit>, or <Proxy> before r1740928). This is a bit of a misnomer, at least, so instead of (ab)using it by adding the missing contexts (in an incompatible way), let's define NOT_IN_DIR_CONTEXT to really exclude all directory context (i.e. NOT_IN_DIR_LOC_FILE + NOT_IN_LIMIT + NOT_IN_PROXY) and use it wherever NOT_IN_DIR_LOC_FILE was used. This is by itself a major MMN bump (modules not compiled with this commit and having directives checked against NOT_IN_DIR_LOC_FILE won't be caught the same way by NOT_IN_DIR_CONTEXT in the new ap_check_cmd_context() code), but with the below change, 2.4.x should work as before: - if ((forbidden & NOT_IN_DIR_CONTEXT) == NOT_IN_DIR_CONTEXT) { + if ((forbidden & NOT_IN_DIR_LOC_FILE) == NOT_IN_DIR_LOC_FILE) { if (cmd->path != NULL) { return apr_pstrcat(cmd->pool, cmd->cmd->name, gt, - " cannot occur within directory context", NULL); + " cannot occur within <Directory/Location/Files/Proxy> " + "section", NULL); } ... } git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1812193 13f79535-47bb-0310-9956-ffa450edef68
* config: follow up to r1809302.Yann Ylavic2017-09-221-9/+15
| | | | | | | | | Provide a convenient function to get module flags, and remove useless AP_MODULE_HAS_FLAGS checks in the core, core's version is at current MMN. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809311 13f79535-47bb-0310-9956-ffa450edef68
* config: follow up to r1809302.Yann Ylavic2017-09-221-2/+5
| | | | | | | | We need to check that the module itself is at the right version. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809305 13f79535-47bb-0310-9956-ffa450edef68
* config: allow to specify flags when registering modules.Yann Ylavic2017-09-221-0/+15
| | | | | | | | First one is AP_MODULE_FLAG_ALWAYS_MERGE. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809302 13f79535-47bb-0310-9956-ffa450edef68
* * server/config.c, include/http_config.h (ap_build_cont_config,Joe Orton2017-03-091-2/+2
| | | | | | | | | | ap_soak_end_container): Constify directive arguments - existing callers pass string literals. * server/core.c (start_cond_section): Remove casts needed for above. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1786120 13f79535-47bb-0310-9956-ffa450edef68
* Add <IfDirective> and <IfSection>:Joe Orton2017-03-091-0/+8
| | | | | | | | | | | | | | | | * server/core.c (test_ifdirective_section, test_ifsection_section): New callbacks. (core_cmds): Define new directives. * include/http_config.h, server/config.c (ap_exists_directive): New function. * include/ap_mmn.h: Bump MMN minor for above. * docs/manual/mod/core.xml: Add docs. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1786110 13f79535-47bb-0310-9956-ffa450edef68
* http_config: follow up to r1702948: maybe unused, yet maybe usefull too.Yann Ylavic2016-09-061-6/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1759415 13f79535-47bb-0310-9956-ffa450edef68
* Fix spelling in comments and text files.Rainer Jung2016-08-111-2/+2
| | | | | | | | No functional change. PR 59990 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1756038 13f79535-47bb-0310-9956-ffa450edef68
* mod_proxy, mod_ssl: Handle SSLProxy* directives in <Proxy> sections,Yann Ylavic2016-04-261-3/+6
| | | | | | | | allowing per backend TLS configuration. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1740928 13f79535-47bb-0310-9956-ffa450edef68
* httpd compiles warning free on gcc and every new warning will be treated as ↵Stefan Eissing2015-09-141-1/+18
| | | | | | an error, standard c-89 is enforced git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1702948 13f79535-47bb-0310-9956-ffa450edef68
* expand commentEric Covener2015-01-301-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1656062 13f79535-47bb-0310-9956-ffa450edef68
* Provide a way for EXEC_ON_READ directives to see their contextEric Covener2015-01-301-1/+4
| | | | | | | | | | | | | | (parent directive). Usually, this context is not also EXEC_ON_READ so it's not fully processed, so e.g cmd->path is not fluffed up yet because the closing tag of the section is not read yet and ap_check_cmd_context() doesn't work) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1656058 13f79535-47bb-0310-9956-ffa450edef68
* AP_INIT_NO_ARGS mishandled in macroEric Covener2015-01-271-2/+2
| | | | | | | | | | Submitted by: Joachim Zobel <jzobel heute-morgen.de>, covener Committed by: covener git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1655146 13f79535-47bb-0310-9956-ffa450edef68
* doxygen improvementsJeff Trawick2014-01-221-1/+11
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1560482 13f79535-47bb-0310-9956-ffa450edef68
* fix a couple of grammar problemsJeff Trawick2013-08-011-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1509341 13f79535-47bb-0310-9956-ffa450edef68
* Replace pre_htaccess hook with more flexible open_htaccess hookStefan Fritsch2013-07-021-6/+22
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1498880 13f79535-47bb-0310-9956-ffa450edef68
* Make ap_check_cmd_context() treat <If> sections like <File> sections.Stefan Fritsch2012-11-071-3/+3
| | | | | | | | | | | This is necessary to properly disallow directives that don't work in <If>. A separate NOT_IN_IF flag may be nicer, but would create much more hassle when being backported to 2.4. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1406495 13f79535-47bb-0310-9956-ffa450edef68
* add pre_htaccess hook; in conjunction with earlier dirwalk_statJeff Trawick2012-09-241-0/+9
| | | | | | | | | and post_perdir_config hooks, this should allow mpm-itk to be used without patches to httpd core git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1389339 13f79535-47bb-0310-9956-ffa450edef68
* Docs (and minor comment change) for DefaultRuntimeDir directiveJim Jagielski2012-03-071-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1297959 13f79535-47bb-0310-9956-ffa450edef68
* Fold on Jeff's DefaultRuntimeDir impl... docs on the wayJim Jagielski2012-03-071-0/+8
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1297955 13f79535-47bb-0310-9956-ffa450edef68
* Core configuration: add AllowOverride option to treat syntaxNick Kew2012-01-091-0/+7
| | | | | | | | | errors in .htaccess as non-fatal. PR 52439 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1229021 13f79535-47bb-0310-9956-ffa450edef68
* Clean up size_t abuse, part 2. ap_malloc/calloc/realloc are explicitlyWilliam A. Rowe Jr2012-01-061-3/+3
| | | | | | | | | excluded from this cleanup as they must be signature identical to the clib functions, and although the definition of size_t has been flakey, the definition of those functions appears to be generally clean since ANSI C. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1228323 13f79535-47bb-0310-9956-ffa450edef68
* Limit length of lines in .htaccess to 8K again, to reduce DoS potential.Stefan Fritsch2011-12-121-0/+6
| | | | | | | Make ap_varbuf_cfg_getline() strictly enforce the max_len parameter. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1213338 13f79535-47bb-0310-9956-ffa450edef68
* Consistenly use apr_file_* API instead of libc when dumping config becauseStefan Fritsch2011-10-091-0/+4
| | | | | | | mixing the two can give strange results due to buffering. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1180671 13f79535-47bb-0310-9956-ffa450edef68
* cleanups related to new AllowOverrideList functionality:Stefan Fritsch2011-08-031-0/+1
| | | | | | | | | - 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
* Add AllowOverrideList directive and documentationDaniel Ruggeri2011-07-281-0/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1151654 13f79535-47bb-0310-9956-ffa450edef68
* Document the weird semantics of ap_find_command_in_modules()Stefan Fritsch2011-07-261-3/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1151045 13f79535-47bb-0310-9956-ffa450edef68
* dox fixStefan Fritsch2011-06-251-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1139540 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 new ap_reserve_module_slots/ap_reserve_module_slots_directive API,Stefan Fritsch2011-04-251-1/+18
| | | | | | | | | | 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
* clarify commentStefan Fritsch2011-04-171-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1094127 13f79535-47bb-0310-9956-ffa450edef68
* Axed tabs and trailing spaces.Guenter Knauf2011-04-131-106/+106
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1091621 13f79535-47bb-0310-9956-ffa450edef68
* Add CHANGES entry for r1086756 / ap_cfg_* changeStefan Fritsch2011-03-291-1/+2
| | | | | | | Update docs for ap_cfg_getc git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1086761 13f79535-47bb-0310-9956-ffa450edef68
* Change the ap_cfg_getline() and ap_cfg_getc() to return an error code.Stefan Fritsch2011-03-291-14/+30
| | | | | | | | | | | | | 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
* fix doxygen warningsJeff Trawick2011-03-281-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1086071 13f79535-47bb-0310-9956-ffa450edef68
* fix some grammar mistakes, mostly in commentsJeff Trawick2011-03-121-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1080821 13f79535-47bb-0310-9956-ffa450edef68
* Fix some Windows build issuesStefan Fritsch2010-11-251-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1039204 13f79535-47bb-0310-9956-ffa450edef68
* mod_proxy: Fix ProxyPassInterpolateEnv directive.Stefan Fritsch2010-11-181-1/+11
| | | | | | | PR: 50292 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1036602 13f79535-47bb-0310-9956-ffa450edef68
* * Fix parameter name as new is a reserved word in C++ which makes compilingRuediger Pluem2010-11-101-4/+4
| | | | | | | | | of http_config.h with C++ impossible. PR: 50243 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1033427 13f79535-47bb-0310-9956-ffa450edef68
* Add a generic pool cleanup function that sets a pointer to NULL and useStefan Fritsch2010-11-061-0/+8
| | | | | | | it to replace various pool cleanup functions. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1032167 13f79535-47bb-0310-9956-ffa450edef68
* Add ErrorLogFormat directive for configuring the error log format, includingStefan Fritsch2010-09-051-1/+1
| | | | | | | | | | additional information that is logged once per connection or request. Add error log IDs for connections and request to allow correlating error log lines and the corresponding access log entry. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@992806 13f79535-47bb-0310-9956-ffa450edef68
* - add more comments explaining the logging macrosStefan Fritsch2010-08-251-3/+20
| | | | | | | | - make the documentation more doxygen friendly, as suggested by Justin Erenkrantz git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@989377 13f79535-47bb-0310-9956-ffa450edef68
* Trivial spelling fix so I can closeNick Kew2010-07-201-1/+1
| | | | | | | PR 44195 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@965712 13f79535-47bb-0310-9956-ffa450edef68