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
29,900 Commits 62 Branches 313 Tags
httpdunit
Commit Graph

174 Commits

Author SHA1 Message Date
Joe Orton
f843f6fd07 * server/config.c, include/http_config.h (ap_build_cont_config, 
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
 2017-03-09 09:48:24 +00:00
Joe Orton
ec40c3c197 Add <IfDirective> and <IfSection>: 
* 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
 2017-03-09 08:39:56 +00:00
Yann Ylavic
8b562b9331 http_config: follow up to r1702948: maybe unused, yet maybe usefull too. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1759415 13f79535-47bb-0310-9956-ffa450edef68
 2016-09-06 12:07:39 +00:00
Rainer Jung
d79b514c4b Fix spelling in comments and text files. 
No functional change.
PR 59990


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1756038 13f79535-47bb-0310-9956-ffa450edef68
 2016-08-11 19:50:02 +00:00
Yann Ylavic
f9ad2754f7 mod_proxy, mod_ssl: Handle SSLProxy* directives in <Proxy> sections, 
allowing per backend TLS configuration.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1740928 13f79535-47bb-0310-9956-ffa450edef68
 2016-04-26 00:04:57 +00:00
Stefan Eissing
ea390af213 httpd compiles warning free on gcc and every new warning will be treated as 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
 2015-09-14 13:29:35 +00:00
Eric Covener
d5227d2da4 expand comment 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1656062 13f79535-47bb-0310-9956-ffa450edef68
 2015-01-30 17:15:02 +00:00
Eric Covener
2154a9de68 Provide a way for EXEC_ON_READ directives to see their context 
(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
 2015-01-30 16:58:20 +00:00
Eric Covener
a77068dd87 AP_INIT_NO_ARGS mishandled in macro 
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
 2015-01-27 20:21:48 +00:00
Jeff Trawick
3508158873 doxygen improvements 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1560482 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-22 19:15:14 +00:00
Jeff Trawick
cf212a0867 fix a couple of grammar problems 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1509341 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-01 17:36:11 +00:00
Stefan Fritsch
a011e2a43f Replace pre_htaccess hook with more flexible open_htaccess hook 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1498880 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-02 11:26:41 +00:00
Stefan Fritsch
289ead8ef7 Make ap_check_cmd_context() treat <If> sections like <File> sections. 
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
 2012-11-07 08:33:05 +00:00
Jeff Trawick
dfc4862f0e add pre_htaccess hook; in conjunction with earlier dirwalk_stat 
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
 2012-09-24 12:42:32 +00:00
Jim Jagielski
25c27c59dd Docs (and minor comment change) for DefaultRuntimeDir directive 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1297959 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-07 12:51:04 +00:00
Jim Jagielski
fc1b444d2e Fold on Jeff's DefaultRuntimeDir impl... docs on the way 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1297955 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-07 12:31:58 +00:00
Nick Kew
e0ddfe0fdf Core configuration: add AllowOverride option to treat syntax 
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
 2012-01-09 04:01:06 +00:00
William A. Rowe Jr
2aa21a62b1 Clean up size_t abuse, part 2. ap_malloc/calloc/realloc are explicitly 
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
 2012-01-06 18:15:08 +00:00
Stefan Fritsch
91ce790cd3 Limit length of lines in .htaccess to 8K again, to reduce DoS potential. 
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
 2011-12-12 17:50:33 +00:00
Stefan Fritsch
cd17cd2c10 Consistenly use apr_file_* API instead of libc when dumping config because 
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
 2011-10-09 17:55:06 +00:00
Stefan Fritsch
9d2ca013b6 cleanups related to new AllowOverrideList functionality: 
- 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
 2011-08-03 21:36:18 +00:00
Daniel Ruggeri
0d69087127 Add AllowOverrideList directive and documentation 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1151654 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-27 22:24:14 +00:00
Stefan Fritsch
ec8235ddbf Document the weird semantics of ap_find_command_in_modules() 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1151045 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-26 09:47:51 +00:00
Stefan Fritsch
ccdc32e52d dox fix 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1139540 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-25 12:44:08 +00:00
Jim Jagielski
2aef21903c Cleanup... most don't need apr_hooks.h at all... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1101067 13f79535-47bb-0310-9956-ffa450edef68
 2011-05-09 15:36:32 +00:00
Stefan Fritsch
bf07c1867c Add new ap_reserve_module_slots/ap_reserve_module_slots_directive API, 
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
 2011-04-25 19:22:04 +00:00
Stefan Fritsch
065710a4a3 clarify comment 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1094127 13f79535-47bb-0310-9956-ffa450edef68
 2011-04-17 10:17:37 +00:00
Guenter Knauf
f93cae2d6d Axed tabs and trailing spaces. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1091621 13f79535-47bb-0310-9956-ffa450edef68
 2011-04-13 01:29:02 +00:00
Stefan Fritsch
d49ccfd744 Add CHANGES entry for r1086756 / ap_cfg_* change 
Update docs for ap_cfg_getc


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1086761 13f79535-47bb-0310-9956-ffa450edef68
 2011-03-29 21:38:03 +00:00
Stefan Fritsch
7b61bedb2f Change the ap_cfg_getline() and ap_cfg_getc() to return an error code. 
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
 2011-03-29 21:29:34 +00:00
Jeff Trawick
bc956c30c3 fix doxygen warnings 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1086071 13f79535-47bb-0310-9956-ffa450edef68
 2011-03-27 23:36:03 +00:00
Jeff Trawick
4598f1a7d4 fix some grammar mistakes, mostly in comments 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1080821 13f79535-47bb-0310-9956-ffa450edef68
 2011-03-12 00:35:39 +00:00
Stefan Fritsch
cf0e2c3a46 Fix some Windows build issues 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1039204 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-25 22:27:17 +00:00
Stefan Fritsch
39db8e5413 mod_proxy: Fix ProxyPassInterpolateEnv directive. 
PR: 50292


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1036602 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-18 20:15:24 +00:00
Ruediger Pluem
38064564e9 * Fix parameter name as new is a reserved word in C++ which makes compiling 
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
 2010-11-10 12:09:27 +00:00
Stefan Fritsch
286c8622b6 Add a generic pool cleanup function that sets a pointer to NULL and use 
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
 2010-11-06 22:12:41 +00:00
Stefan Fritsch
70be0f7a07 Add ErrorLogFormat directive for configuring the error log format, including 
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
 2010-09-05 15:44:19 +00:00
Stefan Fritsch
ca8ee159b0 - add more comments explaining the logging macros 
- 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
 2010-08-25 21:29:41 +00:00
Nick Kew
e9f4f3fd81 Trivial spelling fix so I can close 
PR 44195


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@965712 13f79535-47bb-0310-9956-ffa450edef68
 2010-07-20 01:55:18 +00:00
Stefan Fritsch
ae5ef058ac Add ap_find_module_short_name() to quickly get the module short name 
(i.e. symbol name with trailing "_module" removed) from the module_index.
To be used for logging.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@965408 13f79535-47bb-0310-9956-ffa450edef68
 2010-07-19 10:06:15 +00:00
Stefan Fritsch
ed451e94d1 re-order many struct members for better alignment on 64bit 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@959464 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-30 22:34:05 +00:00
Stefan Fritsch
0d11ddb595 - Introduce ap_log_cserror to allow mod_ssl to associate log messages to 
different servers than c->base_server.
- Adjust the scope of some mod_ssl trace logging from server to conn.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@954611 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-14 19:59:05 +00:00
Stefan Fritsch
dd5fdf5987 Fix some issues found by Ruediger Pluem 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@953125 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-09 19:31:26 +00:00
Stefan Fritsch
2334a1ea4f - Add loglevels to request_rec and conn_rec 
- Introduce per-directory loglevel configuration


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951897 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-06 17:04:40 +00:00
Stefan Fritsch
98a1e93dca - Introduce log levels trace1/.../trace8 
- Add macro wrappers for ap_log_*error. On C99, this will save argument
  preparation and function call overhead when a message is not logged
  because of the configured loglevel.
- Introduce per-module loglevel configuration.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951893 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-06 16:54:51 +00:00
William A. Rowe Jr
1108773c08 First order simplification; Add IncludeOptional for introducing 
wildcard pattern matches or specific includes which may be omitted.
Refactors ap_process_resource_config() to deal efficiently with 
a single file, and renames the new _ex() flavor per list discussion
to  ap_process_fnmatch_configs() for wildcard processing.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@931435 13f79535-47bb-0310-9956-ffa450edef68
 2010-04-07 04:51:46 +00:00
Graham Leggett
1688cae4cf Add the missing header file from r928916. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@929663 13f79535-47bb-0310-9956-ffa450edef68
 2010-03-31 19:04:34 +00:00
Stefan Fritsch
60821a3b74 replace duplicate code with new function ap_parse_log_level() 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@905454 13f79535-47bb-0310-9956-ffa450edef68
 2010-02-01 23:27:32 +00:00
Daniel Earl Poirier
e30af9ed74 Fix remaining doxygen warnings. "make dox" is now clean with doxygen 
version 1.5.8.

PR: 48093
Submitted by: Brad Hards
Reviewed by: poirier


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@832442 13f79535-47bb-0310-9956-ffa450edef68
 2009-11-03 14:59:24 +00:00
Daniel Earl Poirier
04fd4abf90 Fix a lot of doxygen warnings. Thanks to Brad Hards for the patch. 
I added a few more fixes, and there are still more that might
need a doxygen expert.

PR: 48061
Submitted by: Brad Hards
Reviewed by: poirier


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@830527 13f79535-47bb-0310-9956-ffa450edef68
 2009-10-28 13:25:49 +00:00