1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Commit Graph

22452 Commits

Author SHA1 Message Date
Igor Galić
fae7207c35 update xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1205888 13f79535-47bb-0310-9956-ffa450edef68
2011-11-24 15:40:53 +00:00
Igor Galić
2c7c819a54 Pr#52239: clarify Event MPM's behaviour with strictly
synchronous libraries.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1205885 13f79535-47bb-0310-9956-ffa450edef68
2011-11-24 15:34:19 +00:00
Jim Jagielski
b147ccf9fe document userland change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1205849 13f79535-47bb-0310-9956-ffa450edef68
2011-11-24 14:38:34 +00:00
Gregg Lewis Smith
5930da73cc add util.regex.c to MPM, had been unneeded untill r1200055
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1205568 13f79535-47bb-0310-9956-ffa450edef68
2011-11-23 20:33:25 +00:00
Stefan Fritsch
ea54b8b1d5 fix comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1205564 13f79535-47bb-0310-9956-ffa450edef68
2011-11-23 20:24:49 +00:00
Eric Covener
d94f4fa7bf mod_ratelimit has an output filter, not a handler. Also took a quick
pass through the other text.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1205560 13f79535-47bb-0310-9956-ffa450edef68
2011-11-23 20:09:24 +00:00
Stefan Fritsch
419c40c564 update xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1205553 13f79535-47bb-0310-9956-ffa450edef68
2011-11-23 19:55:24 +00:00
Stefan Fritsch
4a25728501 The expression parser is not only a developer change.
Mention reduced memory usage.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1205550 13f79535-47bb-0310-9956-ffa450edef68
2011-11-23 19:52:29 +00:00
Stefan Fritsch
7aecef792e Make it more explicit that mod_lua may change in 2.4.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1205542 13f79535-47bb-0310-9956-ffa450edef68
2011-11-23 19:40:21 +00:00
Eric Covener
fc154457a8 specify limited context list for ModemStandard
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1205468 13f79535-47bb-0310-9956-ffa450edef68
2011-11-23 16:03:42 +00:00
Jim Jagielski
bf2fc8ee54 Use ap_pass_brigade_fchk()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1205423 13f79535-47bb-0310-9956-ffa450edef68
2011-11-23 15:01:42 +00:00
Jim Jagielski
d2342460fd Add ap_pass_brigade_fchk() which does a Filter CHecK on the
brigade pass.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1205419 13f79535-47bb-0310-9956-ffa450edef68
2011-11-23 14:52:43 +00:00
Igor Galić
00225ba565 rebuild markup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1205381 13f79535-47bb-0310-9956-ffa450edef68
2011-11-23 12:25:00 +00:00
Igor Galić
11c0bea586 mod_session: document overrides.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1205379 13f79535-47bb-0310-9956-ffa450edef68
2011-11-23 12:21:23 +00:00
Eric Covener
57b853536b mod_negotiation: don't return non-AP_FILTER_ERROR filter return values
to ap_run_handler() when sending a body directly from a type-map.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1205274 13f79535-47bb-0310-9956-ffa450edef68
2011-11-23 03:36:22 +00:00
Graham Leggett
e6810567ce Update the documentation for the %a and %{c}a logging format strings, and
update the mod-remoteip documentation in line with the new API.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1205075 13f79535-47bb-0310-9956-ffa450edef68
2011-11-22 16:50:00 +00:00
Graham Leggett
d98a314d98 Align the format variable for the raw IP between the error_log and the
access_log.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1205061 13f79535-47bb-0310-9956-ffa450edef68
2011-11-22 16:16:51 +00:00
Jim Jagielski
f94cf9a7f0 Hello. Let's compile again.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204998 13f79535-47bb-0310-9956-ffa450edef68
2011-11-22 14:02:25 +00:00
Graham Leggett
7df4fb3537 Add the ability to access the connection level remote IP address from the
expression parser.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204990 13f79535-47bb-0310-9956-ffa450edef68
2011-11-22 13:40:58 +00:00
Graham Leggett
4ee7eea4cf Introduce a per request version of the remote IP address, which can be
optionally modified by a module when the effective IP of the client
is not the same as the real IP of the client (such as a load balancer).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204968 13f79535-47bb-0310-9956-ffa450edef68
2011-11-22 13:10:39 +00:00
Rainer Jung
e68738b5dc Partial cleanup of trunk STATUS.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204927 13f79535-47bb-0310-9956-ffa450edef68
2011-11-22 11:28:30 +00:00
Stefan Fritsch
2bffeda10b Downgrade some more error messages about broken client behavior to level
info.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204630 13f79535-47bb-0310-9956-ffa450edef68
2011-11-21 18:16:01 +00:00
Stefan Fritsch
e0184da329 Pass ap_errorlog_info to error_log hook.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204614 13f79535-47bb-0310-9956-ffa450edef68
2011-11-21 17:36:26 +00:00
Graham Leggett
78e657406b mod_cache_disk: Make sure we check return codes on all writes and attempts
to close, and clean up after ourselves in these cases. PR43589.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204599 13f79535-47bb-0310-9956-ffa450edef68
2011-11-21 17:06:15 +00:00
Stefan Fritsch
add3418303 Fix logic when to call error_log hook
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204595 13f79535-47bb-0310-9956-ffa450edef68
2011-11-21 17:01:10 +00:00
Jim Jagielski
99ca5c4a2c value never used: dead assignment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204558 13f79535-47bb-0310-9956-ffa450edef68
2011-11-21 15:51:48 +00:00
Jim Jagielski
f16552affe check return status
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204556 13f79535-47bb-0310-9956-ffa450edef68
2011-11-21 15:51:46 +00:00
Jim Jagielski
0871cc77f8 value never used: dead assignment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204555 13f79535-47bb-0310-9956-ffa450edef68
2011-11-21 15:51:44 +00:00
Jim Jagielski
f785889504 value never used : dead assignment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204554 13f79535-47bb-0310-9956-ffa450edef68
2011-11-21 15:51:43 +00:00
Jim Jagielski
846dd30b32 Never used.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204553 13f79535-47bb-0310-9956-ffa450edef68
2011-11-21 15:51:40 +00:00
Eric Covener
04d5492b0b roll back pair of recent autoindex changes (1204355:1204306)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204356 13f79535-47bb-0310-9956-ffa450edef68
2011-11-21 05:12:12 +00:00
Eric Covener
a109706a9e PR51471: IndexIgnore doesn't work in DirectoryMatch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204341 13f79535-47bb-0310-9956-ffa450edef68
2011-11-21 03:29:12 +00:00
Eric Covener
99d2c7f419 upgrading/compat notes on some unexpected AddDescription behavior
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204317 13f79535-47bb-0310-9956-ffa450edef68
2011-11-21 01:38:11 +00:00
Eric Covener
6c2475f70e PR39923: Allow AddDescription to work with absolute filesystem paths,
by not adding "*/" to their prefix (intended for relative paths)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204307 13f79535-47bb-0310-9956-ffa450edef68
2011-11-21 01:03:15 +00:00
Graham Leggett
90f47f68e0 mod_include: The SSIAccessEnable directive existed to ensure the addition
of the "-A" syntax would not break existing configurations in v2.2. Remove
the directive for v2.4, defaulting the behaviour to enabled.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204183 13f79535-47bb-0310-9956-ffa450edef68
2011-11-20 16:49:38 +00:00
Stefan Fritsch
ab7b448082 Fix segfault caused by r1204104 on non-async mpms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204180 13f79535-47bb-0310-9956-ffa450edef68
2011-11-20 16:41:42 +00:00
Stefan Fritsch
40ac38ff05 Remove MPM-private stuff from conn_state_t
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204104 13f79535-47bb-0310-9956-ffa450edef68
2011-11-19 23:35:46 +00:00
Graham Leggett
4ed1b41510 mod_cache_disk: Remove the unnecessary intermediate brigade while writing
to disk. Fixes a problem where mod_disk_cache was leaving buckets in the
intermediate brigade and not passing them to out on exit.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204101 13f79535-47bb-0310-9956-ffa450edef68
2011-11-19 22:37:55 +00:00
Stefan Fritsch
294efcbd32 clarify comment
remove broken recursion counting bits


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204090 13f79535-47bb-0310-9956-ffa450edef68
2011-11-19 22:06:16 +00:00
Stefan Fritsch
92663b1e32 Limit recursion in ap_expr evaluation to avoid unbounded stack usage
* evaluate chains of ||, &&, and string concatenation non-recursively
* limit other types of recursion to 20 levels
* avoid some string copies if concatenating more than 2 strings


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204087 13f79535-47bb-0310-9956-ffa450edef68
2011-11-19 21:58:48 +00:00
Lucien Gentis
045be68402 Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1203980 13f79535-47bb-0310-9956-ffa450edef68
2011-11-19 14:12:55 +00:00
Gregg Lewis Smith
1a3e83723a Build mod_allowmethods on Windows
project file exists


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1203924 13f79535-47bb-0310-9956-ffa450edef68
2011-11-19 00:35:17 +00:00
Stefan Fritsch
b56ba5a823 More ap_log_rerror() usage and axe some more AJP: prefixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1203878 13f79535-47bb-0310-9956-ffa450edef68
2011-11-18 22:02:27 +00:00
Graham Leggett
5a19e40f95 Style fixes, no functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1203875 13f79535-47bb-0310-9956-ffa450edef68
2011-11-18 22:00:35 +00:00
Stefan Fritsch
2bd6f96a1a Log fatal errors at level CRIT, not at some random level from DEBUG to EMERG
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1203868 13f79535-47bb-0310-9956-ffa450edef68
2011-11-18 21:49:44 +00:00
Stefan Fritsch
8ec7f5c5bf great proxy logging cleanup:
* remove "proxy:", "FCGI", etc. prefixes and pid which are now
    included in the error log format

  * propagate frontend request's logconfig to backend request
    
  * use ap_log_rerror where possible
    
  * remove obsolete APLOG_NOERRNO


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1203859 13f79535-47bb-0310-9956-ffa450edef68
2011-11-18 21:41:09 +00:00
Jeff Trawick
ecd6cdf256 follow up to r1202257 -- perform normal wakeup processing when
APR_EINTR is seen from apr_pollset_poll(), with expectation that
it was triggered by apr_pollset_wakeup()


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1203858 13f79535-47bb-0310-9956-ffa450edef68
2011-11-18 21:39:33 +00:00
Ruediger Pluem
fc08292c7e * Actually change the defines and not only the comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1203792 13f79535-47bb-0310-9956-ffa450edef68
2011-11-18 19:12:31 +00:00
Kaspar Brand
c0d91dd1a9 update transformations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1203761 13f79535-47bb-0310-9956-ffa450edef68
2011-11-18 17:37:36 +00:00
Kaspar Brand
96746b9253 Change the SSLCipherSuite default to a shorter, whitelist
oriented definition, and add an example for a speed-optimized
configuration (commented out by default).

In the SSL How-To, streamline the SSLCipherSuite examples where
applicable (explicitly banning EXP and NULL is not needed when
only HIGH is specified).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1203752 13f79535-47bb-0310-9956-ffa450edef68
2011-11-18 17:17:20 +00:00