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

140 Commits

Author SHA1 Message Date
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
Igor Galić
0b57e95fe4 Adding #logging link.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1002646 13f79535-47bb-0310-9956-ffa450edef68
2010-09-29 14:21:25 +00:00
Rich Bowen
cbea02b479 Make a note about RewriteLog for folks that are looking for it. Probably
should leave this here for a couple years until folks get used to the
new stuff.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1001232 13f79535-47bb-0310-9956-ffa450edef68
2010-09-25 15:07:49 +00:00
Rich Bowen
1b8797e925 Reformat these <pre> tables as actual HTML tables
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@999415 13f79535-47bb-0310-9956-ffa450edef68
2010-09-21 13:49:25 +00:00
Rich Bowen
c40c509433 Removes the completely unecessary .* on several examples where it only
serves to slow down the match process.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@999404 13f79535-47bb-0310-9956-ffa450edef68
2010-09-21 13:28:01 +00:00
Rich Bowen
4104c4cde1 Adds the -le, -lt, -eq, -ge, and -gt test flags added by wrowe.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@999401 13f79535-47bb-0310-9956-ffa450edef68
2010-09-21 13:23:57 +00:00
Rich Bowen
f69c5bdca0 Add descriptions of the new RewriteCond test flags, -L, -h, and the new
>= and <= syntax, added by wrowe in r997553.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@999383 13f79535-47bb-0310-9956-ffa450edef68
2010-09-21 13:02:02 +00:00
Igor Galić
10fc07caf8 Missing a word.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@983745 13f79535-47bb-0310-9956-ffa450edef68
2010-08-09 17:34:49 +00:00
Rainer Jung
60e8f3a913 Allow to set environment variables using mod_rewrite without
explicitely giving a value.

Most modules only check presence of a variable, not the
value, so it makes sense to make the VAL argument in
the mod_rewrite ENV flag optional.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@960233 13f79535-47bb-0310-9956-ffa450edef68
2010-07-03 16:21:58 +00:00
Stefan Fritsch
a5f4ee1845 Replace RewriteLog/RewriteLogLevel with trace log levels
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951903 13f79535-47bb-0310-9956-ffa450edef68
2010-06-06 17:09:43 +00:00
Rich Bowen
831425bb30 I think this might look better as a DL than as a TABLE.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@945947 13f79535-47bb-0310-9956-ffa450edef68
2010-05-18 23:12:38 +00:00
Rich Bowen
c13c39ce06 Moves most of the rewritemap stuff out into its own document where we
can give it the exhaustive treatment it deserves without making the
reference doc unmanageable.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@945921 13f79535-47bb-0310-9956-ffa450edef68
2010-05-18 22:02:33 +00:00
Rich Bowen
6d10612f5b 'Apache' -> 'Apache HTTP Server' etc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@926416 13f79535-47bb-0310-9956-ffa450edef68
2010-03-23 00:46:17 +00:00
Eric Covener
297dfb62b8 mention the quirksof REQUEST_FILENAME earlier. PR48796
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@914980 13f79535-47bb-0310-9956-ffa450edef68
2010-02-22 17:46:23 +00:00
Stefan Fritsch
7b74009049 Make ap_pregsub(), used by AliasMatch and friends, use the same syntax
for regex backreferences as mod_rewrite and mod_include: Remove the use
of '&' as an alias for '$0' and allow to escape any character with a
backslash.

Document the use of $0.

PR: 48351


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@904765 13f79535-47bb-0310-9956-ffa450edef68
2010-01-30 11:20:53 +00:00
Lucien Gentis
ceac8571d3 Updates and 2 little typos in manual/mod/mod_rewrite.xml.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@896921 13f79535-47bb-0310-9956-ffa450edef68
2010-01-07 16:40:21 +00:00
Rich Bowen
5da48520eb Removes duplication of the RewriteRule flags documentation. The module
doc contains a table of definitions. The rewrite flag doc contains
detailed explanations and examples.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@895060 13f79535-47bb-0310-9956-ffa450edef68
2010-01-01 20:02:30 +00:00
Rich Bowen
c4b0fa2f7d Adds a [QSD] flag to RewriteRule to discard unwanted query strings
without the old kludge of sticking a ? on the end of the target URI.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@894383 13f79535-47bb-0310-9956-ffa450edef68
2009-12-29 13:34:24 +00:00
André Malo
991dd648f9 revert r832627, because it uses invalid xml structure
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@889973 13f79535-47bb-0310-9956-ffa450edef68
2009-12-12 20:28:44 +00:00
Jeff Trawick
6565e2228b move a couple of special warnings for SysV sems and Posix sems out of the
performance tuning guide and into the common Mutex documentation; remove the
other (duplicate) information from that guide and instead point to the Mutex
directive

mpm_common: axe docs for old accept mutex directives

worker and prefork: axe links to old accept mutex directives, mention the use
of the accept mutex and how it can be configured

event: axe links to old mutex directives where were already N/A

mod_rewrite: axe old RewriteLock directive, mention use of the rewrite map
mutex for RewriteMap programs and how it can be configured

fix other miscellaneous LockFile or AcceptMutex references


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@883878 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 21:08:37 +00:00
Eric Covener
514827929b continue clarification of RewriteBase, lots of users who install little
PHP apps with an Alias a) leave off RewriteBase then b) add the filesystem
path instead of the URL-path then c) spend hours trying to debug
the RewriteRules themselves.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@883030 13f79535-47bb-0310-9956-ffa450edef68
2009-11-22 01:38:59 +00:00
Eric Covener
5848a42169 add an early note about the Pattern in a rewriterule behaving
counterintuitively in per-directory context. (lots of mysterious no-op 
rulesets due to ^/ in htaccess)

Tweak QSA text.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@832914 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 23:48:52 +00:00
Noirin Plunkett
c423645206 Split RewriteCond into two sections, brought TestString section up to date.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@832627 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 00:10:36 +00:00
Noirin Plunkett
6bda4890a2 Removing more cruft, rewriting what's left
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@832239 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 01:09:38 +00:00
Noirin Plunkett
fd8ad0059b Ripping out the stuff that isn't really module reference, and translating the
introduction to English


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@832130 13f79535-47bb-0310-9956-ffa450edef68
2009-11-02 22:05:01 +00:00