21e0a16abb
Changing the default Options from All to FollowSymlinks.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1052419 13f79535-47bb-0310-9956-ffa450edef68
2010-12-24 00:37:30 +00:00
befd3a14b1
The expression parser has moved.
...
Move the touch rules in the Netware Makefiles too.
Hope this works.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1049723 13f79535-47bb-0310-9956-ffa450edef68
2010-12-15 21:46:19 +00:00
adca7b491e
indentation + coding style fixes
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1044679 13f79535-47bb-0310-9956-ffa450edef68
2010-12-11 17:16:54 +00:00
676cc45e8b
PR50349: Honor 'AcceptPathInfo OFF' during internal redirects,
...
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
2010-12-07 13:06:22 +00:00
81ba030297
simplify ServerName check with apr_fnmatch_test()
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1042157 13f79535-47bb-0310-9956-ffa450edef68
2010-12-04 12:03:38 +00:00
6cea387b1f
Remove useless 'const' to fix compiler warning
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1042147 13f79535-47bb-0310-9956-ffa450edef68
2010-12-04 11:23:55 +00:00
b93e49391b
Rename ap_expr's typedef names:
...
ap_expr -> ap_expr_t
ap_expr_parse_ctx -> ap_expr_parse_ctx_t
ap_expr_eval_ctx -> ap_expr_eval_ctx_t
ap_expr_lookup_fn -> ap_expr_lookup_fn_t
ap_expr_node_op -> ap_expr_node_op_e
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1042146 13f79535-47bb-0310-9956-ffa450edef68
2010-12-04 11:22:30 +00:00
f5d3a4c3f4
core: Fail startup when the argument to ServerName looks like a glob
...
or a regular expression instead of a hostname (*?[]). PR 39863
Submitted By: Rahul Nair <rahul.g.nair gmail.com>
Reviewed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1042098 13f79535-47bb-0310-9956-ffa450edef68
2010-12-04 04:14:03 +00:00
efa98ce0f0
Fix warning about comparing signed/unsigned
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1041140 13f79535-47bb-0310-9956-ffa450edef68
2010-12-01 19:25:15 +00:00
be0cd65b51
Correct constness fix to manipulate our copy
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1040866 13f79535-47bb-0310-9956-ffa450edef68
2010-12-01 03:11:46 +00:00
dbf4a86e3d
Fixed some win32 types.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1040220 13f79535-47bb-0310-9956-ffa450edef68
2010-11-29 18:33:28 +00:00
d185fd5f57
PR50350: When no -k option is provided on the httpd command line, the server
...
was starting without checking for an existing pidfile.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1039989 13f79535-47bb-0310-9956-ffa450edef68
2010-11-29 00:10:22 +00:00
fc7b453ebc
update flex/bison autogenerated code
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1039901 13f79535-47bb-0310-9956-ffa450edef68
2010-11-28 16:35:49 +00:00
e27a3c21e3
- add -ipmatch, -str(c)match, -fnmatch, -R operators to ap_expr
...
- allow lookup function to pre-parse string constant arguments
(used for subnet masks so far)
- various bug fixes for binary operators
- do strdup() for error messages created on the stack to avoid corruption
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1039900 13f79535-47bb-0310-9956-ffa450edef68
2010-11-28 16:35:14 +00:00
1bb69047c9
improve hack to not break if a fixed version of flex is used
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1039546 13f79535-47bb-0310-9956-ffa450edef68
2010-11-26 20:10:55 +00:00
6166d5bf16
Remove some unused functions for which flex forgets to add prototypes, leading
...
to compiler warnings.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1039543 13f79535-47bb-0310-9956-ffa450edef68
2010-11-26 20:04:48 +00:00
c409988d42
Fix another Windows build issue: Add a wrapper around ap_run_expr_lookup with
...
the correct calling convention.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1039528 13f79535-47bb-0310-9956-ffa450edef68
2010-11-26 19:32:13 +00:00
3264064750
Another Windows build fix
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1039208 13f79535-47bb-0310-9956-ffa450edef68
2010-11-25 22:32:10 +00:00
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
a4454cb0e2
Fix for picky compilers.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1037605 13f79535-47bb-0310-9956-ffa450edef68
2010-11-22 05:02:56 +00:00
b6649687a3
More ap_expr updates:
...
- minor bump for ap_expr_exec_re() introduced in r1037504
- actually commit the changes to allow using backreferences in SetEnvIfExpr
- automatically add the correct entries to the Vary-header if the result of
an expression evaluation depends on a request header
(can be turned off by setting the AP_EXPR_FLAGS_DONT_VARY flag)
- set AP_EXPR_FLAGS_DONT_VARY in mod_log_config's conditional logging
- fix various off-by-one errors in req_table_func
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1037540 13f79535-47bb-0310-9956-ffa450edef68
2010-11-21 19:51:41 +00:00
6ef1911acc
ap_expr related fixes/enhancements:
...
- implement regex backreferences and make them available for setting
envvars in SetEnvIfExpr
- implement nested function calls in %-syntax: %{func1:%{func2:arg}}
- actually implement evaluation of concatenation operator (oops...)
- Fix <If ... > treating an internal error as success
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1037504 13f79535-47bb-0310-9956-ffa450edef68
2010-11-21 17:22:26 +00:00
b4db6ddb3e
Don't compile expr_dump_tree() by default
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1037325 13f79535-47bb-0310-9956-ffa450edef68
2010-11-20 20:42:57 +00:00
53d0129701
Check input lenght to avoid potential overflows
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1037321 13f79535-47bb-0310-9956-ffa450edef68
2010-11-20 20:26:37 +00:00
c40fa87ce7
Log errors/infos during expression evaluation and associate the message
...
with the module that is calling ap_expr_exec()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1037140 13f79535-47bb-0310-9956-ffa450edef68
2010-11-20 08:59:50 +00:00
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
f1527a397d
When restarting, reset ap_server_config_defines to what was set on the command
...
line. This makes the result more predictable for the user and resolves some
string lifetime issues in the implementation of set_define/unset_define.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1033619 13f79535-47bb-0310-9956-ffa450edef68
2010-11-10 18:03:32 +00:00
aafd50dec1
Supress generation of unused yy_top_state function, to avoid a compiler
...
warning. Regenerate the scanner code with flex.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1033594 13f79535-47bb-0310-9956-ffa450edef68
2010-11-10 17:22:20 +00:00
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
86508e66ab
support error log id as variables
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1033167 13f79535-47bb-0310-9956-ffa450edef68
2010-11-09 19:24:45 +00:00
66e4cc4676
Add Error directive for aborting startup or htaccess processing
...
with a specified error message.
Be nice and strip off any quotes, which aren't necessary.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1032565 13f79535-47bb-0310-9956-ffa450edef68
2010-11-08 13:15:17 +00:00
b6aec76bc1
Support %{HANDLER} in ap_expr (required for mod_filter)
...
Update mod_filter docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1032413 13f79535-47bb-0310-9956-ffa450edef68
2010-11-07 22:53:59 +00:00
6056703807
Implement "reqenv", "note", "-z", "-n" in ap_expr.
...
Make "env" ssl_expr compatible
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1032408 13f79535-47bb-0310-9956-ffa450edef68
2010-11-07 22:06:33 +00:00
29d566dd9b
Port "file" function from ssl_expr
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1032393 13f79535-47bb-0310-9956-ffa450edef68
2010-11-07 21:09:19 +00:00
94c5270ab5
More fixes for picky compilers
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1032268 13f79535-47bb-0310-9956-ffa450edef68
2010-11-07 13:00:00 +00:00
bed44770b5
Implement "HTTPS" and "IPV6" vars in ap_expr
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1032170 13f79535-47bb-0310-9956-ffa450edef68
2010-11-06 22:21:46 +00:00
e32977e84f
Another ooops: properly return APR_SUCCESS
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1032169 13f79535-47bb-0310-9956-ffa450edef68
2010-11-06 22:16:25 +00:00
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
50efd54644
Netware build fixes
...
Submitted by: NormW <normw gknw net>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1032163 13f79535-47bb-0310-9956-ffa450edef68
2010-11-06 21:47:39 +00:00
35cdba6976
Replace ap_expr with a parser derived from mod_ssl's parser. Make mod_ssl use
...
the new parser. Rework ap_expr's public interface and provide hooks for modules
to add variables and functions.
The Netware and Windows build files still need to be adjusted
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1032073 13f79535-47bb-0310-9956-ffa450edef68
2010-11-06 14:31:16 +00:00
26d9243e32
Fix hook sorting for the pre_config hook.
...
Move modules/http/config2.m4 back to modules/http/config.m4, since this was
only done as work-around in r88887 for the broken hook-sorting.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1032002 13f79535-47bb-0310-9956-ffa450edef68
2010-11-06 11:11:17 +00:00
efb8c83d07
correction to r1031776, retain OR_UNSET with default AllowOverride None
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1031794 13f79535-47bb-0310-9956-ffa450edef68
2010-11-05 21:00:18 +00:00
433c97df4e
PR49823: Make the hardcoded default for AllowOverride match the default config -- None.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1031776 13f79535-47bb-0310-9956-ffa450edef68
2010-11-05 20:21:09 +00:00
b0c950bd71
PR#47782: compiled-in default for MaxConnectionsPerChild is 10,000 vs the
...
recommendations in the default conf and the manual.
Principle of least astonishment says to use a baked-in value of zero until
an admin asks for processes to exit this way.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1031657 13f79535-47bb-0310-9956-ffa450edef68
2010-11-05 16:29:08 +00:00
749058def7
PR#45722: if we get EACCESS in the directory walk, give the hint that's in 1.3
...
about search permissions on intermediate directories. I left the prefix of the message
as "denied" instead of "failed" to satisfy web searches.
The extended error text was added to 1.3.x but not trunk in
http://svn.apache.org/viewvc?view=revision&revision=99781
This plagues users on IRC!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1031307 13f79535-47bb-0310-9956-ffa450edef68
2010-11-04 22:36:37 +00:00
00cdb469d7
use temp pool in some more places
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1026657 13f79535-47bb-0310-9956-ffa450edef68
2010-10-23 18:06:49 +00:00
5390992e03
Be extra careful to only pass the main server config to
...
ap_find_loaded_module_symbol. Fixes a segfault when using per-module
LogLevel on virtual host scope.
PR: 50117
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1025702 13f79535-47bb-0310-9956-ffa450edef68
2010-10-20 19:53:57 +00:00
2768a20d29
Added header include for getpid() prototype on Win32.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1025496 13f79535-47bb-0310-9956-ffa450edef68
2010-10-20 11:03:01 +00:00
0de2a457c0
Some minor fixes to provide protos and build with Watcom.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1025492 13f79535-47bb-0310-9956-ffa450edef68
2010-10-20 10:57:28 +00:00
1a54421be0
Set the LogLevel of a newly initialized virtual hosts to UNSET. Otherwise
...
it will not be correctly merged in ap_fixup_virtual_hosts().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1024427 13f79535-47bb-0310-9956-ffa450edef68
2010-10-19 21:53:38 +00:00
