]>
granicus.if.org Git - apache/log
Jim Jagielski [Wed, 14 Jan 2015 13:30:31 +0000 (13:30 +0000)]
backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1651664 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 13 Jan 2015 20:46:54 +0000 (20:46 +0000)]
update transforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1651485 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 13 Jan 2015 20:39:34 +0000 (20:39 +0000)]
Insert .htaccess example talking about relative paths when using
mod_rewrite in .htaccess files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1651479 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 13 Jan 2015 13:54:17 +0000 (13:54 +0000)]
Backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1651343 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 12 Jan 2015 13:45:30 +0000 (13:45 +0000)]
r1651088 for eventopt
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1651089 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 12 Jan 2015 13:42:31 +0000 (13:42 +0000)]
Update conn_rec.id when a new thread begins working on a connection, because
the old thread may work on a new connection and assign the same ID in parallel.
Submitted By: Michael Thorpe
Committed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1651088 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 10 Jan 2015 16:09:17 +0000 (16:09 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1650763 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 10 Jan 2015 16:07:26 +0000 (16:07 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1650762 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 9 Jan 2015 10:24:28 +0000 (10:24 +0000)]
* modules/dav/main/config.m4: Remove long-redundant expat reference.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1650490 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 8 Jan 2015 16:24:28 +0000 (16:24 +0000)]
Xforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1650322 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 8 Jan 2015 16:13:55 +0000 (16:13 +0000)]
Fix copy and paste error in docs of new feature.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1650320 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 8 Jan 2015 15:36:43 +0000 (15:36 +0000)]
Xforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1650311 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 8 Jan 2015 15:34:10 +0000 (15:34 +0000)]
Add SSLSessionTickets (on|off).
It controls the use of TLS session tickets
(RFC 5077). Default is unchanged (on).
Using session tickets without restarting
the web server with an appropriate frequency
(e.g. daily) compromises perfect forward
secrecy.
As long as we do not have a nice key management
there should be a way to deactivate session
tickets.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1650310 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 8 Jan 2015 15:28:48 +0000 (15:28 +0000)]
save some bytes per Christophe's review.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1650309 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 7 Jan 2015 14:20:57 +0000 (14:20 +0000)]
mod_ssl: follow up to r1601919.
Likewise when set from SNI callback.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1650061 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Wed, 7 Jan 2015 12:27:00 +0000 (12:27 +0000)]
update mod_ssl.html.en transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1650048 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Wed, 7 Jan 2015 12:24:48 +0000 (12:24 +0000)]
Add support for extracting subjectAltName entries of type
rfc822Name and dNSName into SSL_{CLIENT,SERVER}_SAN_{Email,DNS}_n
variables.
* docs/manual/mod/mod_ssl.xml: add SSL_*_SAN_*_n entries to the
environment variables table
* modules/ssl/ssl_engine_kernel.c: in ssl_hook_Fixup, add extraction
of subjectAltName entries for the "StdEnvVars" case
* modules/ssl/ssl_engine_vars.c: add support for retrieving the
SSL_{CLIENT,SERVER}_SAN_{Email,DNS}_n variables, either with
individual on-demand lookup (ssl_var_lookup_ssl_cert_san),
or with full-list extraction to the environment ("StdEnvVars")
* modules/ssl/ssl_private.h: add modssl_var_extract_san_entries prototype
* modules/ssl/ssl_util_ssl.c: implement SSL_X509_getSAN and
SSL_ASN1_STRING_to_utf8 helper functions, with factoring out common
code from SSL_X509_getIDs and SSL_X509_NAME_ENTRY_to_string where
suitable. Limit SSL_X509_getSAN to the two most common subjectAltName
entry types appearing in user or server certificates (i.e., rfc822Name
and dNSName), for the time being.
* modules/ssl/ssl_util_ssl.h: add SSL_ASN1_STRING_to_utf8
and SSL_X509_getSAN prototypes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1650047 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 7 Jan 2015 10:36:12 +0000 (10:36 +0000)]
mod_proxy: Don't put non balancer-member workers in error state by
default for connection or 500/503 errors, and honor status=+I for
any error. PR 48388.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1650028 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 6 Jan 2015 22:56:02 +0000 (22:56 +0000)]
Add CHANGE for r1649632
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1649966 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 6 Jan 2015 22:46:34 +0000 (22:46 +0000)]
Add PR
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1649964 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 5 Jan 2015 20:03:50 +0000 (20:03 +0000)]
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
Christophe Jaillet [Mon, 5 Jan 2015 19:53:35 +0000 (19:53 +0000)]
Be consistant with the code below which accepts lower or upper case.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1649632 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 5 Jan 2015 10:06:29 +0000 (10:06 +0000)]
* modules/cache/mod_socache_memcache.c (socache_mc_store): Pass
through expiration time.
Submitted by: Faidon Liambotis <paravoid debian.org>, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1649491 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 4 Jan 2015 14:10:06 +0000 (14:10 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1649341 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 4 Jan 2015 14:09:16 +0000 (14:09 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1649340 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 4 Jan 2015 14:06:00 +0000 (14:06 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1649339 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 4 Jan 2015 14:04:34 +0000 (14:04 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1649338 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 4 Jan 2015 13:43:21 +0000 (13:43 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1649332 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 4 Jan 2015 13:40:37 +0000 (13:40 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1649330 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 4 Jan 2015 13:38:28 +0000 (13:38 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1649328 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 4 Jan 2015 13:28:54 +0000 (13:28 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1649327 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 4 Jan 2015 13:27:14 +0000 (13:27 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1649326 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 4 Jan 2015 13:23:16 +0000 (13:23 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1649325 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 3 Jan 2015 15:37:54 +0000 (15:37 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1649211 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 3 Jan 2015 15:36:48 +0000 (15:36 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1649210 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 2 Jan 2015 14:28:39 +0000 (14:28 +0000)]
mod_proxy_ajp: Fix get_content_length().
clength in request_rec is for response sizes,
not request body size. It is initialized to 0,
so the "if" branch was never taken.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1649043 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 2 Jan 2015 11:42:59 +0000 (11:42 +0000)]
Xforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1649002 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 2 Jan 2015 11:36:45 +0000 (11:36 +0000)]
PR 48460: Improve/correct mod_proxy_ajp docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1649001 13f79535 -47bb-0310-9956-
ffa450edef68
Fabien Coelho [Thu, 1 Jan 2015 13:56:40 +0000 (13:56 +0000)]
Add a hint about how CONNECT-method requests are filtered out by <Proxy>,
and how to enable them. I could not find this information easily.
In particular, the straightforward <Proxy https://www.example.com>... does
not allow CONNECT to the corresponding SSL server. Probably it would work
if a web client sent a "GET https://www.example.com/ HTTP/1.1" to the
proxy, but none would do that.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1648846 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 1 Jan 2015 13:48:56 +0000 (13:48 +0000)]
Regenerate xforms after s/2014/2015/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1648843 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 1 Jan 2015 13:05:30 +0000 (13:05 +0000)]
Happy New Year 2015
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1648840 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 31 Dec 2014 15:39:02 +0000 (15:39 +0000)]
split-logfile: Fix perl error: 'Can't use string ("example.org:80")
as a symbol ref while "strict refs"'. PR 56329.
Submitted By: Holger Mauermann <mauermann gmail.com>
Committed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1648719 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Tue, 30 Dec 2014 17:43:59 +0000 (17:43 +0000)]
Fix some spelling errors in mod_proxy_fcgi comments.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1648557 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 29 Dec 2014 21:05:56 +0000 (21:05 +0000)]
PR 56603: Inappropiate ProxyPassReverse match when interpolated URL
is empty string
Submitted By: <ajprout hotmail.com>
Committed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1648433 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 29 Dec 2014 20:04:52 +0000 (20:04 +0000)]
s/BitNami/Bitnami/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1648416 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 29 Dec 2014 17:27:46 +0000 (17:27 +0000)]
Configuration files with long lines and continuation characters
are not read properly. PR 55910.
Submitted By: Manuel Mausz <manuel-as mausz.at>
Committed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1648394 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 28 Dec 2014 14:57:01 +0000 (14:57 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1648211 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 28 Dec 2014 14:55:39 +0000 (14:55 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1648210 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sun, 28 Dec 2014 13:43:25 +0000 (13:43 +0000)]
Add class attributes for empty descriptions
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1648201 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 22 Dec 2014 15:39:54 +0000 (15:39 +0000)]
Change the return value to const, so the const non-matching input can just be
returned.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1647334 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 22 Dec 2014 00:44:01 +0000 (00:44 +0000)]
some tweaks for no ServerName from PR57384
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1647229 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 21 Dec 2014 16:53:20 +0000 (16:53 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1647171 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 21 Dec 2014 16:52:07 +0000 (16:52 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1647170 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 21 Dec 2014 15:32:51 +0000 (15:32 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1647156 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 21 Dec 2014 15:30:52 +0000 (15:30 +0000)]
fix path as well
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1647154 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 21 Dec 2014 15:28:41 +0000 (15:28 +0000)]
fix anchor to #workers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1647153 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 21 Dec 2014 11:47:26 +0000 (11:47 +0000)]
looks like debug left in r1642154
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1647125 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 20 Dec 2014 18:45:23 +0000 (18:45 +0000)]
provide alternative PATH_INFO calculation options for proxy_fcgi.
PR 55329
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1647035 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 20 Dec 2014 16:07:56 +0000 (16:07 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1647013 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 20 Dec 2014 16:07:34 +0000 (16:07 +0000)]
PATH_INFO is set for free when we use SetHandler style configuration,
because we have already directory walked.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1647012 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 20 Dec 2014 16:02:25 +0000 (16:02 +0000)]
show a worker+uds+sethandler configuration
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1647011 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 20 Dec 2014 15:56:38 +0000 (15:56 +0000)]
typo and formatting
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1647010 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 20 Dec 2014 15:56:16 +0000 (15:56 +0000)]
Allow SetHandler+UDS+fcgi to take advantage of dedicated workers including
opting in to connection reuse and other proxy options (max=, etc).
adds 'enablereuse' proxyoption and a minor MMN bump to share
proxy_desocketfy outside of mod_proxy.c, which is required to
match workers to URLs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1647009 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 20 Dec 2014 15:38:35 +0000 (15:38 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1647006 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 20 Dec 2014 15:38:27 +0000 (15:38 +0000)]
Allow (a hokey) opt-in to connection reuse for mod_proxy_fcgi + TCP.
Connection reuse has been disabled since r1032345 at the end of
2011.
Attempt to reverse the polarity of the connection reuse doc which
has been wrong for a long time.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1647005 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 19 Dec 2014 23:42:12 +0000 (23:42 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1646902 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 19 Dec 2014 23:41:58 +0000 (23:41 +0000)]
add more examples, mention one reason to use SetHandler.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1646901 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 19 Dec 2014 14:03:52 +0000 (14:03 +0000)]
tweak SCRIPT_FILENAME passed to fastcgi backends when a balancer is used.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1646724 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 18 Dec 2014 06:57:38 +0000 (06:57 +0000)]
Fix example as spotted in a comment in online doc.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1646392 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 17 Dec 2014 15:39:15 +0000 (15:39 +0000)]
* Fix If-Match handling:
- We need to fail if we do NOT match.
- ETag comparison only makes sense if we have an ETag
PR: 57358
Submitted by: Kunihiko Sakamoto <ksakamoto google.com>
Reviewed by: rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1646282 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 16 Dec 2014 13:09:42 +0000 (13:09 +0000)]
in 2.4
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1645938 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 16 Dec 2014 07:12:52 +0000 (07:12 +0000)]
Fix command line parameters as spotted in a comment in the online doc.
Thx alfonz.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1645864 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 15 Dec 2014 14:57:52 +0000 (14:57 +0000)]
* Return NULL instead of an empty string as ssl_var_lookup_ssl does by default. Thanks for the pointer Christophe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1645670 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 15 Dec 2014 01:37:40 +0000 (01:37 +0000)]
Fix extraction of an SCT list from a stapled OCSP response.
The hard-coded 2 byte offset to get to the list (in lieu of
the proper logic) didn't survive the addition of the SCT
from an additional log.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1645546 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 14 Dec 2014 21:48:25 +0000 (21:48 +0000)]
ssl_io_filter_handshake(): When a post-handshake check fails,
return an error code understood by ssl_io_filter_error().
That function needs to perform error handling, and a valid
apr_status_t needs to be returned up.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1645529 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 10 Dec 2014 18:45:24 +0000 (18:45 +0000)]
mod_proxy: don't add the default port to the name of proxy workers. PR 57259.
ap_proxy_port_of_scheme() knows more default ports than apr_unparse_uri().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1644503 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 10 Dec 2014 18:06:55 +0000 (18:06 +0000)]
* mod_ssl: Fix renegotiation failures redirected to an ErrorDocument. PR 57334.
When this occurs, the redirect (internal) request reaches ssl_hook_Access()
and make SSL_do_handshake crash probably because we force the renegotiation
based on an incomplete SSL state.
To avoid this, ssl_hook_Access() now returns FORBIDDEN immediatly if the given
SSL connection is not in a valid (handshaken) state.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1644498 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Tue, 9 Dec 2014 23:55:22 +0000 (23:55 +0000)]
Added include path for Windows build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1644245 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Tue, 9 Dec 2014 11:39:57 +0000 (11:39 +0000)]
* mod_proxy_fcgi: Follow up to r1640495. Ignore body data from backend
for 304 responses also when read with the header.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1644031 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 9 Dec 2014 01:55:52 +0000 (01:55 +0000)]
backported in r1642861
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643967 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 8 Dec 2014 21:20:50 +0000 (21:20 +0000)]
util_expr: sync bison generated source files with according
to changes on server/util_expr_parse.y from r1642154.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643929 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 8 Dec 2014 20:06:24 +0000 (20:06 +0000)]
Revert r1643900.
May someone with a bison version closer to the original one make this change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643901 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 8 Dec 2014 19:46:53 +0000 (19:46 +0000)]
util_expr: sync bison generated source files with
server/util_expr_parse.y from r1642154.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643900 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 8 Dec 2014 14:29:13 +0000 (14:29 +0000)]
* core: Fix -D[efined] or <Define>[d] variables lifetime accross restarts.
PR 57328.
Submitted-by: Armin Abfalterer <a.abfalterer gmail.com>
Reviewed/Committed-by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643825 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 7 Dec 2014 15:55:19 +0000 (15:55 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643687 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 7 Dec 2014 15:54:05 +0000 (15:54 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643686 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 7 Dec 2014 12:54:52 +0000 (12:54 +0000)]
dump fcgi headers with trace8 instead of debug+compile-time flag.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643672 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 6 Dec 2014 15:36:19 +0000 (15:36 +0000)]
mod_proxy_ajp: follow up to r1643537.
Log aborted client connections with level DEBUG only (no more noise than other proxy modules).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643543 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 6 Dec 2014 15:04:27 +0000 (15:04 +0000)]
minor commentary and indentation fixes for ap_log_*data()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643538 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 6 Dec 2014 14:33:52 +0000 (14:33 +0000)]
* mod_proxy_ajp: Fix client connection errors handling and logged status
when it occurs. PR 56823.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643537 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 6 Dec 2014 14:14:39 +0000 (14:14 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643533 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 6 Dec 2014 14:13:44 +0000 (14:13 +0000)]
Move some tweaked/re-tested recipes from https://wiki.apache.org/httpd/RewriteQueryString into the
extended doc for mod_rewrite.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643531 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Fri, 5 Dec 2014 22:32:05 +0000 (22:32 +0000)]
set svn:eol-style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643462 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Fri, 5 Dec 2014 22:21:48 +0000 (22:21 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643456 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Fri, 5 Dec 2014 22:04:40 +0000 (22:04 +0000)]
validate xml
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643442 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 5 Dec 2014 21:06:31 +0000 (21:06 +0000)]
Synch trunk with 2.4.x.
In r1588495, additionnal logging has been added to 2.4.x as part of the merge.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643434 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 5 Dec 2014 20:23:56 +0000 (20:23 +0000)]
Fix typo + correctly spell this poor Barbara name, otherwise she will never be able to get access
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643416 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 5 Dec 2014 14:00:37 +0000 (14:00 +0000)]
mpm_event(opt): zero is immutable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643284 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 5 Dec 2014 13:54:30 +0000 (13:54 +0000)]
mpm_worker: replace apr_atomic_cas32(+1) loop with the more performant
apr_atomic_inc32().
Also declare fd_queue_info_t's idlers member as volatile since it is
used outside atomic functions (or it could be optimized out by the
compiler).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643282 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 5 Dec 2014 13:41:38 +0000 (13:41 +0000)]
mpm_event(opt): avoid casts/comparisons from unsigned to signed (atomics).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643279 13f79535 -47bb-0310-9956-
ffa450edef68