1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-11 02:42:23 +03:00
Commit Graph

164 Commits

Author SHA1 Message Date
Rainer Jung
96a8fb8351 Drop pre-2.3 compatibility notes from trunk docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1421821 13f79535-47bb-0310-9956-ffa450edef68
2012-12-14 12:35:47 +00:00
Eric Covener
5d16310f14 PR53963: don't merge the rewritebase down w/o an opt-in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1410681 13f79535-47bb-0310-9956-ffa450edef68
2012-11-17 02:59:31 +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
61edb2f608 misc typo fixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1379836 13f79535-47bb-0310-9956-ffa450edef68
2012-09-01 20:20:16 +00:00
Daniel Gruno
f41ef3973c Note that using rewrites with a file-path substitution in a .htaccess file will look for files relative to your document root, not relative to your file system root.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1379321 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 07:02:54 +00:00
Daniel Gruno
5ce06e1409 typo fixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1364341 13f79535-47bb-0310-9956-ffa450edef68
2012-07-22 16:01:01 +00:00
Joe Orton
83acd755ee * modules/mappers/mod_rewrite.c (cmd_rewriteoptions, hook_uri2file):
Add "AllowAnyURI" flag which disables the strict URL-path input
  string check introduced to fix CVE-2011-3368/CVE-2011-4317.

* docs/manual: Update docs.

Inspired by: covener


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1356115 13f79535-47bb-0310-9956-ffa450edef68
2012-07-02 08:51:01 +00:00
Rich Bowen
ebeb7ccedb Reverting change, as what I changed it to wasn't technically accurate.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1334163 13f79535-47bb-0310-9956-ffa450edef68
2012-05-04 20:34:26 +00:00
Rich Bowen
94065a5a68 Update phrasing as requested by
https://issues.apache.org/bugzilla/show_bug.cgi?id=53152


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1334159 13f79535-47bb-0310-9956-ffa450edef68
2012-05-04 20:29:00 +00:00
Daniel Gruno
90a77e573d Syntax updates for mod_r*.xml
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1331219 13f79535-47bb-0310-9956-ffa450edef68
2012-04-27 05:17:57 +00:00
Rich Bowen
bb712b8d01 Fix typo, as per https://issues.apache.org/bugzilla/show_bug.cgi?id=53152
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1330987 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 17:41:46 +00:00
Daniel Gruno
d665d75940 fix grammatical error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1325680 13f79535-47bb-0310-9956-ffa450edef68
2012-04-13 09:26:32 +00:00
Daniel Gruno
e1625cfd6f Fix up some ambiguity
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1325143 13f79535-47bb-0310-9956-ffa450edef68
2012-04-12 07:15:01 +00:00
Daniel Gruno
f3e676be39 Fix up some wordings and grammar.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1325141 13f79535-47bb-0310-9956-ffa450edef68
2012-04-12 07:09:33 +00:00
Daniel Gruno
7ce5b5404d Change "URI" to "URL-path".
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1324971 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 20:09:19 +00:00
Nilgun Belma Buguner
afa640b3b3 fix build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1309551 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 19:16:15 +00:00
Eric Covener
159875a751 PR51969: one more try at explaining RewriteBase, simplify the example and show
how missing rewritebase altogether would go wrong.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1308320 13f79535-47bb-0310-9956-ffa450edef68
2012-04-02 12:37:32 +00:00
Rich Bowen
d3a02694b1 Answer the "what flavor of regex" question.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1301578 13f79535-47bb-0310-9956-ffa450edef68
2012-03-16 15:05:46 +00:00
Rich Bowen
5f545146f6 Trivial s/a/an/ typo correction.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1297835 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 02:08:52 +00:00
Rich Bowen
77d9a99e84 Correct the statement of how query string ordering works with the QSA
flag. Change via nathan.deklepper AT objectconsulting.com.au,
https://issues.apache.org/bugzilla/show_bug.cgi?id=52689


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1296175 13f79535-47bb-0310-9956-ffa450edef68
2012-03-02 12:52:47 +00:00
Rich Bowen
ebbfee6de5 Remove duplicated word
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1242508 13f79535-47bb-0310-9956-ffa450edef68
2012-02-09 20:28:57 +00:00
Eric Covener
23c21127c0 revert "overloaded" recent additions to mod_rewrite
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1239872 13f79535-47bb-0310-9956-ffa450edef68
2012-02-02 21:51:36 +00:00
Eric Covener
f08c2264f8 document a small trunk-only mod_rewrite indulgence
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1239778 13f79535-47bb-0310-9956-ffa450edef68
2012-02-02 19:31:01 +00:00
Eric Covener
29bf1ace3f rewrite guesses URL or Filesystem in server context, but treats everything
as a URL in per-dir context.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1228894 13f79535-47bb-0310-9956-ffa450edef68
2012-01-08 16:57:55 +00:00
Graham Leggett
36c25f8ffa mod_rewrite: Add the AllowNoSlash RewriteOption, which makes it possible
for RewriteRules to be placed in .htaccess files that match the directory
with no trailing slash. PR 48304.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209053 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 12:40:51 +00:00
Rich Bowen
9e12e172c0 Further clarifications of the rewrite process, as per ticket #52000
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1180879 13f79535-47bb-0310-9956-ffa450edef68
2011-10-10 11:32:53 +00:00
Rich Bowen
8ce7c89d58 Clarify behavior of multiple rewrite rules in the same scope. refs https://issues.apache.org/bugzilla/show_bug.cgi?id=51968
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1180734 13f79535-47bb-0310-9956-ffa450edef68
2011-10-09 22:29:41 +00:00
Jim Jagielski
69c1a5c854 Cleanup effort in prep for GA push:
Trim trailing whitespace... no func change


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174747 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 13:36:39 +00:00
Eric Covener
474cdce9f2 be explicit that REQUEST_URI is the path component only
(like r->uri)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1165114 13f79535-47bb-0310-9956-ffa450edef68
2011-09-04 21:22:36 +00:00
Rich Bowen
da53017ae5 Whether it's intentional or not, the hostname/domainname argument to the
RewriteRule CO flag is in fact required. Cookies are not set without it.
(via Matthew Sporleder)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1092797 13f79535-47bb-0310-9956-ffa450edef68
2011-04-15 20:06:53 +00:00
Rich Bowen
53b7c75196 hernan gonzalez <hgonzalez gmail.com> points out that the USER_AGENT
strings were probably more accurate with the leading ^ anchor.
Rebuilds a few other changes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1090284 13f79535-47bb-0310-9956-ffa450edef68
2011-04-08 14:50:47 +00:00
Rich Bowen
e372fb87ac Remove more unnecessary anchors from rewrite examples.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1090265 13f79535-47bb-0310-9956-ffa450edef68
2011-04-08 14:28:05 +00:00
Rich Bowen
4d6ed1270f Fixes typo in mod_rewrite flags doc.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1085361 13f79535-47bb-0310-9956-ffa450edef68
2011-03-25 13:46:27 +00:00
Eric Covener
b4b949bff0 captures of THE_REQUEST are still escaped however the browser sent the request,
ulike most REQUEST_* variables.  PR#50758


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1073591 13f79535-47bb-0310-9956-ffa450edef68
2011-02-23 04:26:06 +00:00
Eric Covener
29fd7ca3f2 the comparison string has been decoded for rewriterule comparison. PR50653
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1063587 13f79535-47bb-0310-9956-ffa450edef68
2011-01-26 03:20:24 +00:00
Eric Covener
1fbdb12548 point to where SERVER_NAME and SERVER_PORT get their
values.  PR50655


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1063585 13f79535-47bb-0310-9956-ffa450edef68
2011-01-26 03:12:56 +00:00
Joe Orton
1b7f020fad * docs/manual/mod/mod_rewrite.xml: Fix docs to match code; only
"discardpath" is accepted, not "discardpathinfo".


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1059356 13f79535-47bb-0310-9956-ffa450edef68
2011-01-15 15:20:50 +00:00
Rich Bowen
fd05d4eac8 Provides an example of using expr in a RewriteCond for a commonly-requested recipe.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1059058 13f79535-47bb-0310-9956-ffa450edef68
2011-01-14 16:21:09 +00:00
Eric Covener
7b163966a7 clarify RewriteBase as action for closed PR50546
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1055710 13f79535-47bb-0310-9956-ffa450edef68
2011-01-06 02:12:01 +00:00
Eric Covener
87171b7df5 typoes caught by noodl
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1055699 13f79535-47bb-0310-9956-ffa450edef68
2011-01-06 01:17:26 +00:00
Eric Covener
7f6e27420f PR#44838: be more up front with how the per-dir RewriteRule comparison is
the filesystem path minus the Directory the rules were listed in.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1055671 13f79535-47bb-0310-9956-ffa450edef68
2011-01-05 22:39:47 +00:00
Stefan Fritsch
6c6979ede6 Make the REQUEST_SCHEME variable available to scripts and mod_rewrite
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1053872 13f79535-47bb-0310-9956-ffa450edef68
2010-12-30 12:34:19 +00:00
Stefan Fritsch
95216d3918 Allow to use arbitrary boolean expressions (ap_expr) in RewriteCond.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1053750 13f79535-47bb-0310-9956-ffa450edef68
2010-12-29 21:48:35 +00:00
Stefan Fritsch
7f6106542e Allow to unset environment variables using E=!VAR.
PR: 49512
Submitted by: Mark Drayton <mark markdrayton info>, Stefan Fritsch


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1053726 13f79535-47bb-0310-9956-ffa450edef68
2010-12-29 20:41:55 +00:00
Eric Covener
255170fcfa fix copy/paste error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1044738 13f79535-47bb-0310-9956-ffa450edef68
2010-12-11 23:13:45 +00:00
Eric Covener
47280b5452 PR 39313: allow the user to configure which rules come first when RewriteRules
are merged with RewriteOptions Inherit.

Submitted By: Jérôme Grandjanny <jerome.grandjanny cea.fr> 
Reviewed By: covener


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1042255 13f79535-47bb-0310-9956-ffa450edef68
2010-12-04 22:33:46 +00:00
Eric Covener
e3c126a1bd PR#40831: empty-valued keys behave like missing keys in a RewriteMap lookup.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1031338 13f79535-47bb-0310-9956-ffa450edef68
2010-11-04 23:10:45 +00:00
Rich Bowen
cec5fed21d Note that RewriteOptions inherit causes parent rules to be applied AFTER
child scope rules. PR46399


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1031046 13f79535-47bb-0310-9956-ffa450edef68
2010-11-04 15:51:51 +00:00
Rich Bowen
e6a13980db LogLevel should specify a global log level as well as the per-module
loglevel.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1029689 13f79535-47bb-0310-9956-ffa450edef68
2010-11-01 14:56:09 +00:00
Eric Covener
a81eb0d43d Add an END flag to RewriteRule that acts like L=LAST but also prevents
further rounds of rewrite processing due to per-directory substitutions.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1028778 13f79535-47bb-0310-9956-ffa450edef68
2010-10-29 14:43:49 +00:00