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

7688 Commits

Author SHA1 Message Date
Kaspar Brand
1aa2b07de2 transformations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1425876 13f79535-47bb-0310-9956-ffa450edef68
2012-12-26 10:59:31 +00:00
Kaspar Brand
50eb694c34 mod_ssl: add support for subjectAltName-based host name checking in proxy mode
(PR 54030)

factor out code from ssl_engine_init.c:ssl_check_public_cert()
to ssl_util_ssl.c:SSL_X509_match_name()

introduce new SSLProxyCheckPeerName directive, which should eventually
obsolete SSLProxyCheckPeerCN

ssl_engine_io.c:ssl_io_filter_handshake(): avoid code duplication
when aborting with HTTP_BAD_GATEWAY


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1425874 13f79535-47bb-0310-9956-ffa450edef68
2012-12-26 10:54:54 +00:00
Daniel Gruno
72ba836343 Fix example code
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1425630 13f79535-47bb-0310-9956-ffa450edef68
2012-12-24 11:05:07 +00:00
Lucien Gentis
0d8cc36816 Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1425492 13f79535-47bb-0310-9956-ffa450edef68
2012-12-23 17:31:58 +00:00
Eric Covener
90746d67e9 caution about merging Location settings on top of directory/files authz config
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1425345 13f79535-47bb-0310-9956-ffa450edef68
2012-12-22 21:16:09 +00:00
Eric Covener
6459776962 xform
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1425030 13f79535-47bb-0310-9956-ffa450edef68
2012-12-21 16:54:21 +00:00
Eric Covener
7c96a66c1a hint about API and module usage.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1425029 13f79535-47bb-0310-9956-ffa450edef68
2012-12-21 16:53:46 +00:00
Daniel Gruno
81f9d80b1f xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1423083 13f79535-47bb-0310-9956-ffa450edef68
2012-12-17 18:26:48 +00:00
Daniel Gruno
375b0c2a49 Some minor tweaks to the wording of the windows page.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1423080 13f79535-47bb-0310-9956-ffa450edef68
2012-12-17 18:24:11 +00:00
Daniel Gruno
ccb302a116 xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1423035 13f79535-47bb-0310-9956-ffa450edef68
2012-12-17 17:29:18 +00:00
Daniel Gruno
bc947afba3 The ASF does not provide official binary packages for 2.4/2.5, so let's not pretend we do.
We can always revert this if/when someone steps up and provides convenience packages again.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1423033 13f79535-47bb-0310-9956-ffa450edef68
2012-12-17 17:28:52 +00:00
Jim Jagielski
f0d70813f5 update xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1423020 13f79535-47bb-0310-9956-ffa450edef68
2012-12-17 17:04:11 +00:00
Jim Jagielski
26ecd7b2fe Redfine - we are just worried about balancers and workers, so have the directive clear about that.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1422980 13f79535-47bb-0310-9956-ffa450edef68
2012-12-17 15:24:40 +00:00
Christophe Jaillet
844012a006 ab: add the possibility to define a socket timeout (-s timeout)
[Guido Serra <zeph fsfe org>]

Also some changes In usage():
- reword -t option to be more clear with the new -s
- add missing -q
- add the new -s option
- reword some options to better match online documentation

ab.xml claimed that -s was already there, but nothing in the code looks like that.
So, I guess it only landed on the online doc...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1422937 13f79535-47bb-0310-9956-ffa450edef68
2012-12-17 14:10:50 +00:00
Rainer Jung
6789743650 Xforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1422597 13f79535-47bb-0310-9956-ffa450edef68
2012-12-16 15:14:01 +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
Lucien Gentis
118372c805 Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1422589 13f79535-47bb-0310-9956-ffa450edef68
2012-12-16 15:01:44 +00:00
Eric Covener
b40ee6c667 xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1422378 13f79535-47bb-0310-9956-ffa450edef68
2012-12-15 22:11:32 +00:00
Eric Covener
3b2115ab3c PR54308: aliasmatch ^/foo matches requests for ////foo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1422375 13f79535-47bb-0310-9956-ffa450edef68
2012-12-15 22:09:02 +00:00
Eric Covener
98dd7b8224 not unique to leading slashes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1422362 13f79535-47bb-0310-9956-ffa450edef68
2012-12-15 21:33:17 +00:00
Eric Covener
1db7749738 PR54307, Alias and leading slashes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1422324 13f79535-47bb-0310-9956-ffa450edef68
2012-12-15 19:37:22 +00:00
Lucien Gentis
d743bc477d Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1422296 13f79535-47bb-0310-9956-ffa450edef68
2012-12-15 17:34:10 +00:00
Rainer Jung
b63656829c Use inherit_set to let the global server set
the default for all vhosts.

Otherwise inherit would need to be disabled
redundantly in each vhost.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1421912 13f79535-47bb-0310-9956-ffa450edef68
2012-12-14 15:02:30 +00:00
Rainer Jung
f5e8f668ab xforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1421895 13f79535-47bb-0310-9956-ffa450edef68
2012-12-14 14:34:50 +00:00
Rainer Jung
ab4ce36c1a Fix use of trailing slashes in proxy
balancer and member URLs and add a little
explanation.

Current behavior AFAIK:

- Any path of a balancer URL inside <Proxy>
  is ignored. So lets not use e.g.trailing slashes
  there. The URL should for consistency always
  look like balancer://mycluster.
- The general comment about trailing slashes on the
  left and right of ProxyPass is also right for
  balancer use.
- Trailing slahes in BalancerMember in most cases
  lead to double slashes on the origin server.
  So lets drop them there and instead get the
  ProxyPass to the balancer right.
- Path components in member URLs are only
  needed, if different path prefixes are needed
  for members in the same balancer (unlikely
  but possible). If all members work with the
  same non-empty additional prefix, put it
  into the ProxyPass at the end of the balancer
  instead.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1421851 13f79535-47bb-0310-9956-ffa450edef68
2012-12-14 13:29:31 +00:00
Rainer Jung
e1c3c791a9 Archaelogy.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1421824 13f79535-47bb-0310-9956-ffa450edef68
2012-12-14 12:42:16 +00:00
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
Rainer Jung
ea38445e20 Docs xforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1420690 13f79535-47bb-0310-9956-ffa450edef68
2012-12-12 14:15:38 +00:00
Rainer Jung
902fbd0c27 Docs update concerning recent htpasswd and htdbm
additions.

Add some cross refernces between dbmmanage and htdbm.

Update man page for htdbm and htpasswd.

Add bcrypt info to misc/password_encryptions.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1420686 13f79535-47bb-0310-9956-ffa450edef68
2012-12-12 14:13:44 +00:00
Rainer Jung
2902c730cc Fix validation error.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1420685 13f79535-47bb-0310-9956-ffa450edef68
2012-12-12 14:12:00 +00:00
Daniel Gruno
3b6cdb0f92 mod_lua: Add a lot of core httpd/apr functionality to mod_lua
(such as regex matching, expr evaluation, changing/fetching server configuration/info - see docs for a complete list).
This also includes a bunch of automatically scraped functions, which may or may not be super useful.
Comments appreciated as always, especially on the more hacky bits.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1420377 13f79535-47bb-0310-9956-ffa450edef68
2012-12-11 20:08:24 +00:00
Rainer Jung
acd00f0e60 Fix typo dbd -> dbm and add htdbm
to dbmmanage note.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1420149 13f79535-47bb-0310-9956-ffa450edef68
2012-12-11 13:37:23 +00:00
Jim Jagielski
ce9b646c73 rjung's suggestions...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1420124 13f79535-47bb-0310-9956-ffa450edef68
2012-12-11 12:35:50 +00:00
Nick Kew
b7a0c5d1fc PR 54269
Tidy up mod_proxy_html docs


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1420120 13f79535-47bb-0310-9956-ffa450edef68
2012-12-11 12:11:29 +00:00
Rainer Jung
a4a3b53669 - Remove backported items from CHANGES.
- Add eventopt to CHANGES
- Remove obsolete compatibility note form SRP docs
  (has been backported).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1420094 13f79535-47bb-0310-9956-ffa450edef68
2012-12-11 11:06:09 +00:00
Stefan Fritsch
b521b14336 xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1418768 13f79535-47bb-0310-9956-ffa450edef68
2012-12-08 22:18:17 +00:00
Stefan Fritsch
d04d01c589 Add LogLevelOverride directive that allows to override the loglevel for
clients from certain IPs


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1418767 13f79535-47bb-0310-9956-ffa450edef68
2012-12-08 22:16:31 +00:00
Fabien Coelho
0886d3fcaf Add minor 'Warning' directive as defined in current mod_macro.
* server/core.c: add 'Warning' directive by extending the 'Error'
  directive implementation. The 'Error' behavior is slightly changed
  so as to use verbose ap_log_error instead of returning the message.
* docs/manual/mod/core.xml: add documentation for 'Warning'.
* server/config.c: add comment about syntax vs configuration errors.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1418677 13f79535-47bb-0310-9956-ffa450edef68
2012-12-08 14:49:09 +00:00
Lucien Gentis
1292cbcfb6 Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1416001 13f79535-47bb-0310-9956-ffa450edef68
2012-12-01 14:27:45 +00:00
Igor Galić
e12e3a8998 xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1415965 13f79535-47bb-0310-9956-ffa450edef68
2012-12-01 10:00:17 +00:00
Igor Galić
cee74c48a5 axe warnings about MSIE 5 and other dead browsers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1415960 13f79535-47bb-0310-9956-ffa450edef68
2012-12-01 09:50:47 +00:00
Igor Galić
ddd2f2565d xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1415550 13f79535-47bb-0310-9956-ffa450edef68
2012-11-30 09:05:46 +00:00
Igor Galić
6f591d17a6 analogous to r1415075
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1415549 13f79535-47bb-0310-9956-ffa450edef68
2012-11-30 09:05:12 +00:00
Igor Galić
39fd81164d xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1415077 13f79535-47bb-0310-9956-ffa450edef68
2012-11-29 08:17:17 +00:00
Igor Galić
e4bbdef245 than -> then
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1415075 13f79535-47bb-0310-9956-ffa450edef68
2012-11-29 08:16:43 +00:00
Vincent Deffontaines
8c14fad76e Zombie translations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1414412 13f79535-47bb-0310-9956-ffa450edef68
2012-11-27 21:49:12 +00:00
Igor Galić
f27297e0b4 xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1414104 13f79535-47bb-0310-9956-ffa450edef68
2012-11-27 10:32:32 +00:00
Igor Galić
4cb4ebab5e as reported by comments
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1414094 13f79535-47bb-0310-9956-ffa450edef68
2012-11-27 10:29:20 +00:00
Lucien Gentis
f054d3c9dd Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1410887 13f79535-47bb-0310-9956-ffa450edef68
2012-11-18 14:12:25 +00:00
Stefan Fritsch
7213dc6dd8 xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1410757 13f79535-47bb-0310-9956-ffa450edef68
2012-11-17 17:52:26 +00:00