1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-12 14:01:05 +03:00
Commit Graph

83 Commits

Author SHA1 Message Date
Ken Coar
430aadce59 * Remove trailing whitespace from a bunch of *.xml files
* Quoted arguments to Rewrite{Base,Cond,Map,Rule}.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673945 13f79535-47bb-0310-9956-ffa450edef68
2015-04-15 20:04:05 +00:00
Ken Coar
b75f3c1fdf Quote {Alias,Redirect,ScriptAlias}{,Match} arguments.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673908 13f79535-47bb-0310-9956-ffa450edef68
2015-04-15 18:04:39 +00:00
Ken Coar
57ef10245b Enclose parameters in quotation marks for <{Files,Directory,Location}{,Match}>
containers.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673892 13f79535-47bb-0310-9956-ffa450edef68
2015-04-15 17:46:53 +00:00
Graham Leggett
6f4e16eca6 mod_authn_core: Add expression support to AuthName and AuthType.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1663123 13f79535-47bb-0310-9956-ffa450edef68
2015-03-01 14:37:11 +00:00
Graham Leggett
9850539bd7 core: Add expression support to ErrorDocument. Switch from a fixed
sized 664 byte array per merge to a hash table.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1661448 13f79535-47bb-0310-9956-ffa450edef68
2015-02-21 23:59:05 +00:00
Graham Leggett
5488d21243 mod_alias: Introduce expression parser support for Alias, ScriptAlias
and Redirect.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1653941 13f79535-47bb-0310-9956-ffa450edef68
2015-01-22 17:02:22 +00:00
Christophe Jaillet
3663e2edf2 Add missing 'filemod' in functions list + minor formatting issue + long line split
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1649636 13f79535-47bb-0310-9956-ffa450edef68
2015-01-05 20:03:50 +00:00
Eric Covener
2ac1d498f7 function examples, other flavor of function examples. replace() example
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643267 13f79535-47bb-0310-9956-ffa450edef68
2014-12-05 13:28:08 +00:00
Eric Covener
040f608207 add a warning to resp() similar to the one present for REQUEST_STATUS [too early in <if>]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643118 13f79535-47bb-0310-9956-ffa450edef68
2014-12-03 13:46:16 +00:00
Eric Covener
d93832ccb3 even out some whitespace
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1642581 13f79535-47bb-0310-9956-ffa450edef68
2014-11-30 18:13:24 +00:00
Jan Kaluža
bd41584fcb * ap_exr: Add replace(string, from, to) function.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1642154 13f79535-47bb-0310-9956-ffa450edef68
2014-11-27 13:46:11 +00:00
Eric Covener
72d7c6c45a add a few more expresion examples to illustrate functions and -f
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1641888 13f79535-47bb-0310-9956-ffa450edef68
2014-11-26 19:05:12 +00:00
Eric Covener
b69ec42080 add a -in wordlist example, change 'string list' to wordlist so you can jump to the grammar.
leave a hint about line endings (uncommitted change in my tree)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1636189 13f79535-47bb-0310-9956-ffa450edef68
2014-11-02 21:01:05 +00:00
Eric Covener
d754154d9a no status during if_walk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1613526 13f79535-47bb-0310-9956-ffa450edef68
2014-07-25 22:24:13 +00:00
Eric Covener
bf37b5e2e8 call out some variables that aren't set during <if>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1613524 13f79535-47bb-0310-9956-ffa450edef68
2014-07-25 22:20:33 +00:00
Christophe Jaillet
799c4a11e8 Add missing variables:
Introduced in r1132494
   CONTEXT_PREFIX
   CONTEXT_DOCUMENT_ROOT
and since the beginning of util_expr_eval.c  for
   HTTP_COOKIE

Description still missing.

+ synch layout with 2.4

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1595353 13f79535-47bb-0310-9956-ffa450edef68
2014-05-16 21:25:10 +00:00
Graham Leggett
84358db95c Add the ldap-search option to mod_authnz_ldap, allowing authorization
to be based on arbitrary expressions that do not include the username.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1589993 13f79535-47bb-0310-9956-ffa450edef68
2014-04-25 11:14:36 +00:00
Graham Leggett
7c05d5e069 Add the ldap function to the expression API, allowing LDAP filters and
distinguished names based on expressions to be escaped correctly to
guard against LDAP injection.

Note: this requires at least APR v1.6.0 or above for the apr_escape API.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1589986 13f79535-47bb-0310-9956-ffa450edef68
2014-04-25 10:55:04 +00:00
Rich Bowen
5021856e04 As per comment, removing quotes makes the example work
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1575406 13f79535-47bb-0310-9956-ffa450edef68
2014-03-07 21:05:11 +00:00
Rich Bowen
30eb86fa91 Add =~ and !~ to the table of comparison operators
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1575391 13f79535-47bb-0310-9956-ffa450edef68
2014-03-07 20:30:09 +00:00
André Malo
e40704c69b this is not a quote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1564957 13f79535-47bb-0310-9956-ffa450edef68
2014-02-05 22:20:24 +00:00
André Malo
c030e071c6 table fixes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1560918 13f79535-47bb-0310-9956-ffa450edef68
2014-01-24 08:35:36 +00:00
André Malo
1e69a66054 rewrap for readability
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1560914 13f79535-47bb-0310-9956-ffa450edef68
2014-01-24 08:18:03 +00:00
Graham Leggett
be8ea07e55 mod_authnz_host: Support the expression parser within the require directives.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1554188 13f79535-47bb-0310-9956-ffa450edef68
2013-12-30 11:14:19 +00:00
Graham Leggett
c8258c2ade mod_authnz_dbm: Support the expression parser within the require directives.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1554170 13f79535-47bb-0310-9956-ffa450edef68
2013-12-30 09:37:17 +00:00
Graham Leggett
133bf49fdf mod_authnz_dbd: Support the expression parser within the require directives.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1554168 13f79535-47bb-0310-9956-ffa450edef68
2013-12-30 08:54:09 +00:00
Graham Leggett
cd7dfa6c1c mod_authnz_ldap: Support the expression parser within the require
directives.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1554161 13f79535-47bb-0310-9956-ffa450edef68
2013-12-30 07:48:18 +00:00
Rich Bowen
b5dae5e0bb Encourage best practice of putting complex arguments in quotes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1481359 13f79535-47bb-0310-9956-ffa450edef68
2013-05-11 15:51:24 +00:00
Daniel Gruno
6f5127e707 s/uppser/upper/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1480901 13f79535-47bb-0310-9956-ffa450edef68
2013-05-10 07:47:43 +00:00
Stefan Fritsch
2f358e7e17 add md5 function, too
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1458004 13f79535-47bb-0310-9956-ffa450edef68
2013-03-18 21:16:18 +00:00
Stefan Fritsch
bc612559f8 sha1 now does hex encoding
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1457995 13f79535-47bb-0310-9956-ffa450edef68
2013-03-18 21:06:39 +00:00
Graham Leggett
6f91fe5dbc mod_auth_basic: Add a generic mechanism to fake basic authentication
using the ap_expr parser. This allows the administrator to construct
their own username and password for basic authentication based on their
needs. Alternative fix for PR52616.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1457471 13f79535-47bb-0310-9956-ffa450edef68
2013-03-17 16:02:41 +00:00
Graham Leggett
c0c5f9db2a Expression parser: Add the ability to apply a SHA1 hash to strings within
the parser.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1457450 13f79535-47bb-0310-9956-ffa450edef68
2013-03-17 13:52:58 +00:00
Graham Leggett
cc78b3134b Expression parser: Add the ability to base64 encode and base64 decode
strings within the parser.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1457437 13f79535-47bb-0310-9956-ffa450edef68
2013-03-17 12:49:27 +00:00
Rich Bowen
5e19168ce9 Typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1446027 13f79535-47bb-0310-9956-ffa450edef68
2013-02-14 01:48:29 +00:00
Rich Bowen
e1d38953a1 Missing trailing slash
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1446015 13f79535-47bb-0310-9956-ffa450edef68
2013-02-14 01:26:01 +00:00
Daniel Gruno
7f9b56db64 Note that v is a shortcut for reqenv
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1440055 13f79535-47bb-0310-9956-ffa450edef68
2013-01-29 18:51:56 +00:00
Rainer Jung
82c7566e3f Add a version compatibility section to the
expression parser docs page.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1422594 13f79535-47bb-0310-9956-ffa450edef68
2012-12-16 15:10:45 +00:00
Stefan Fritsch
2fe77a8fb6 Fix cut'n'paste error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1410756 13f79535-47bb-0310-9956-ffa450edef68
2012-11-17 17:48:29 +00:00
Stefan Fritsch
4aad88eb93 Add SERVER_PROTOCOL_VERSION, SERVER_PROTOCOL_VERSION_MAJOR,
SERVER_PROTOCOL_VERSION_MINOR ap_expr variables.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1410755 13f79535-47bb-0310-9956-ffa450edef68
2012-11-17 17:43:33 +00:00
Stefan Fritsch
eca44e8904 fix cut'n'paste error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1403492 13f79535-47bb-0310-9956-ffa450edef68
2012-10-29 20:42:43 +00:00
Stefan Fritsch
6c8ea86f41 ap_expr: Add req_novary function that allows HTTP header lookups
without adding the name to the Vary header 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1403483 13f79535-47bb-0310-9956-ffa450edef68
2012-10-29 20:34:18 +00:00
Stefan Fritsch
e37fd92653 Mention string-valued expression in the BNF.
Clarify when header names are added to the Vary header.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1403476 13f79535-47bb-0310-9956-ffa450edef68
2012-10-29 20:16:26 +00:00
Daniel Gruno
f237f60599 Use integer operators when comparing to TIME_HOUR
Reported by Florian in comment #124

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1362526 13f79535-47bb-0310-9956-ffa450edef68
2012-07-17 14:52:54 +00:00
Daniel Gruno
181ae7680d Typo fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1334066 13f79535-47bb-0310-9956-ffa450edef68
2012-05-04 17:12:47 +00:00
Daniel Gruno
8fc73d308f Update syntax for expr.xml
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1331257 13f79535-47bb-0310-9956-ffa450edef68
2012-04-27 07:13:21 +00:00
Igor Galić
28af6ca779 Replace weird UTF-8 thingy with - (blame Wikipedia)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1308400 13f79535-47bb-0310-9956-ffa450edef68
2012-04-02 15:52:39 +00:00
Daniel Gruno
52408a0fef Add some examples of how expressions might be used.
This should probably be extended at some point.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1307308 13f79535-47bb-0310-9956-ffa450edef68
2012-03-30 08:46:16 +00:00
Stefan Fritsch
e0a5a7882e Fix names of unary operators like '-s' being compared case insensitively.
Improve error message if op or function is not found. Document '-s' operator. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1212883 13f79535-47bb-0310-9956-ffa450edef68
2011-12-10 21:26:00 +00:00
Graham Leggett
8c8f815c1b Clarify the peer IP of the connection and the client IP of the request within
the docs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1208753 13f79535-47bb-0310-9956-ffa450edef68
2011-11-30 20:28:25 +00:00