a0274a45d0
Hmmm... why did git miss this?
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1664456 13f79535-47bb-0310-9956-ffa450edef68
2015-03-05 18:56:05 +00:00
e45efc0e3c
Move statics
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1664449 13f79535-47bb-0310-9956-ffa450edef68
2015-03-05 18:39:55 +00:00
7d8f15ae04
Fix errors and mistakenly removed rets
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1664443 13f79535-47bb-0310-9956-ffa450edef68
2015-03-05 18:16:47 +00:00
5f7f872c23
Don't return
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1664358 13f79535-47bb-0310-9956-ffa450edef68
2015-03-05 14:35:39 +00:00
227e696228
Move to traditional C header
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1664357 13f79535-47bb-0310-9956-ffa450edef68
2015-03-05 14:35:37 +00:00
83c5985cbb
Fresheh html
...
BUGZ:55466
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1664356 13f79535-47bb-0310-9956-ffa450edef68
2015-03-05 14:35:34 +00:00
03a97d3da0
core: Follow up to r1664071: comments on new keep_alive_timeout_set flag.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1664299 13f79535-47bb-0310-9956-ffa450edef68
2015-03-05 10:41:19 +00:00
8e7ee48c9a
* Setup the usual svn:ignore properties for MPM's
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1664283 13f79535-47bb-0310-9956-ffa450edef68
2015-03-05 09:03:56 +00:00
be0f5335e3
*) SECURITY: CVE-2015-0253 (cve.mitre.org)
...
core: Fix a crash introduced in with ErrorDocument 400 pointing
to a local URL-path with the INCLUDES filter active, introduced
in 2.4.11. PR 57531. [Yann Ylavic]
Submitted By: ylavic
Committed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1664205 13f79535-47bb-0310-9956-ffa450edef68
2015-03-05 02:33:16 +00:00
70201cd149
* Fix typo in error message
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1664133 13f79535-47bb-0310-9956-ffa450edef68
2015-03-04 20:16:34 +00:00
b03a6edcbb
backported
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1664123 13f79535-47bb-0310-9956-ffa450edef68
2015-03-04 19:22:37 +00:00
cfeeefca6f
backported
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1664122 13f79535-47bb-0310-9956-ffa450edef68
2015-03-04 19:22:14 +00:00
6914970982
We no longer need eventopt.
...
And might as well be a good time to add motorz in to trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1664077 13f79535-47bb-0310-9956-ffa450edef68
2015-03-04 17:17:53 +00:00
df173b940d
core: If explicitly configured, use the KeepaliveTimeout value of the
...
virtual host which handled the latest request on the connection, or by
default the one of the first virtual host bound to the same IP:port.
For non-async MPMs, use either r->server's or c->base_server's value in
ap_process_http_sync_connection() depending on a new server_rec's flag
called keep_alive_timeout_set and determined at config time.
For event MPM, use a queue per timeout value, chaining the queues per
type (keepalive wrt KeepAliveTimeout, write completion wrt to Timeout)
so that maintenance can be done on all the queues from the head, and such
that insertions/maintenance remain in O(1).
A server config is created and pointing to the queue of each vhost at
post_config time, hence the config can be associated to the connection
state (cs) at post_read_request time (keep_alive_timeout_set is used to
determine r->server vs c->base_server here), and we can simply insert
with TO_QUEUE_INSERT(cs->sc->q, cs). PR56226.
While at it, since each queue now embeds it own timeout and hence the
expiration_time of the cs has changed to a queue_timestamp (the time it
was queued), we can detect clock skews and expire entries immediatly if
the system is set (eg. far) in the past during runtime and we want to
avoid waiting for (eg.) centuries before the current logic kills them.
Any entry which is registered above now + q->timeout is concerned, and
is now cleaned from the queue when encountered. PR57374.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1664071 13f79535-47bb-0310-9956-ffa450edef68
2015-03-04 16:58:01 +00:00
8209022131
* mod_authn_dbd: apr_pstrdup dbd_password and dbd_hash to fix use-after-free
...
bug with postgresql
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1663647 13f79535-47bb-0310-9956-ffa450edef68
2015-03-03 11:12:18 +00:00
05a733e484
PR54613: protect the invoke_mtx with #if APR_HAS_THREADS.
...
No MMN bump, httpd.h cannot be compiled today without APR_HAS_THREADS. With
APR_HAS_THREADS there is no structure layout change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1663375 13f79535-47bb-0310-9956-ffa450edef68
2015-03-02 17:47:43 +00:00
0888457844
Update.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1663124 13f79535-47bb-0310-9956-ffa450edef68
2015-03-01 14:37:40 +00:00
6f4e16eca6
mod_authn_core: Add expression support to AuthName and AuthType.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1663123 13f79535-47bb-0310-9956-ffa450edef68
2015-03-01 14:37:11 +00:00
284a0e08f1
mpm_event: follow up to r1538490, r1545736, r1604350, r1639614 and r1642868.
...
Clear and restore sbh in notify_suspend() and notify_resume() respectively.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1663017 13f79535-47bb-0310-9956-ffa450edef68
2015-03-01 00:44:49 +00:00
638a4a7e44
Rebuild.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1662959 13f79535-47bb-0310-9956-ffa450edef68
2015-02-28 16:20:35 +00:00
9aee50ae13
XML updates.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1662958 13f79535-47bb-0310-9956-ffa450edef68
2015-02-28 16:19:28 +00:00
13bbf1e38b
Remove some backported entries
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1662642 13f79535-47bb-0310-9956-ffa450edef68
2015-02-27 06:39:15 +00:00
b3d7491b04
mpm_event: follow up to r1493741 and r1662440.
...
Really fix style by not introducing tabs...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1662441 13f79535-47bb-0310-9956-ffa450edef68
2015-02-26 13:18:10 +00:00
3fca989443
mpm_event: follow up to r1493741.
...
Fix typo (and style) for event_unregister_socket_callback()'s final result.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1662440 13f79535-47bb-0310-9956-ffa450edef68
2015-02-26 13:16:19 +00:00
9aa869ec41
mpm_{worker,prefork}: save some cycles by not copying the listener's pollfds
...
for each pollset operation.
We don't need a copy when poll()ing if those are allocated with the correct
lifetime (the listener thread) at the very beginning.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1662437 13f79535-47bb-0310-9956-ffa450edef68
2015-02-26 12:54:23 +00:00
31843ffbd7
CHANGES: follow up to r1662245: Add PR number.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1662246 13f79535-47bb-0310-9956-ffa450edef68
2015-02-25 15:46:03 +00:00
7f823b31d5
mod_deflate: follow up to r1619383 and r1619444: CHANGES entry.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1662245 13f79535-47bb-0310-9956-ffa450edef68
2015-02-25 15:39:36 +00:00
35162c8d7c
xforms
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1662013 13f79535-47bb-0310-9956-ffa450edef68
2015-02-24 16:43:37 +00:00
867b5411fd
improve some slightly awkward wording per comments feedback:
...
http://httpd.apache.org/docs/2.4/configuring.html#comment_3678
The original can be read as applying to comments on a subsequent line.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1662012 13f79535-47bb-0310-9956-ffa450edef68
2015-02-24 16:43:31 +00:00
62eef24b7f
ab: Add missing longest request (100%) to CSV export.
...
Submitted by: Marcin Fabrykowski <bugzilla fabrykowski.pl>
Committed by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1661913 13f79535-47bb-0310-9956-ffa450edef68
2015-02-24 12:14:05 +00:00
f429b5a940
mod_ssl_ct needs a per-vhost module config even if a vhost
...
doesn't contain mod_ssl_ct's own directives, because the
module config needs to represent that vhost's certificates.
PR: 57533
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1661540 13f79535-47bb-0310-9956-ffa450edef68
2015-02-22 20:12:26 +00:00
5c179ce5bc
xform
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1661491 13f79535-47bb-0310-9956-ffa450edef68
2015-02-22 16:29:54 +00:00
33c2c964f9
Refer to a tool from Tom Ritter for storing an SCT in a form
...
suitable for consumption by mod_ssl_ct.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1661490 13f79535-47bb-0310-9956-ffa450edef68
2015-02-22 16:28:48 +00:00
4bc31da012
Follow-up to r1661487:
...
Change the real MMN
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1661489 13f79535-47bb-0310-9956-ffa450edef68
2015-02-22 16:10:02 +00:00
6830babddd
Provide separate SSL_CT_*_STATUS variables for client vs. proxy
...
connections, courtesy of a new flag passed from mod_ssl on its
pre_connection "optional hook."
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1661487 13f79535-47bb-0310-9956-ffa450edef68
2015-02-22 15:50:54 +00:00
186eda9371
axe unused variables
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1661486 13f79535-47bb-0310-9956-ffa450edef68
2015-02-22 15:32:48 +00:00
1c02c75da6
xforms
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1661465 13f79535-47bb-0310-9956-ffa450edef68
2015-02-22 09:45:37 +00:00
6d6c92c2cb
Mention notable things added in 2.4.x
...
Mention mod_macro, mod_wstunnel, mod_authnz_fcgi and a few other notable
features that were added post 2.4.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1661464 13f79535-47bb-0310-9956-ffa450edef68
2015-02-22 09:31:51 +00:00
dc9290caf1
Backported
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1661457 13f79535-47bb-0310-9956-ffa450edef68
2015-02-22 07:45:10 +00:00
9850539bd7
core: Add expression support to ErrorDocument. Switch from a fixed
...
sized 664 byte array per merge to a hash table.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1661448 13f79535-47bb-0310-9956-ffa450edef68
2015-02-21 23:59:05 +00:00
686e567ee5
Rebuild.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1661407 13f79535-47bb-0310-9956-ffa450edef68
2015-02-21 17:18:40 +00:00
40dc685cf1
XML updates.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1661406 13f79535-47bb-0310-9956-ffa450edef68
2015-02-21 17:17:45 +00:00
336ad9d719
Rebuild.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1661405 13f79535-47bb-0310-9956-ffa450edef68
2015-02-21 17:12:57 +00:00
9796d3a55b
XML updates.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1661404 13f79535-47bb-0310-9956-ffa450edef68
2015-02-21 17:10:40 +00:00
4dafb2e780
mod_ssl: Add the SSL_CLIENT_CERT_RFC4523_CEA variable, which provides
...
a combination of certificate serialNumber and issuer as defined by
CertificateExactMatch in RFC4523.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1661258 13f79535-47bb-0310-9956-ffa450edef68
2015-02-21 00:33:34 +00:00
21729aacfe
mod_proxy_ajp: Forward SSL_PROTOCOL. Forthcoming
...
versions of Tomcat know how to extract the information
and provide it as a request attribute.
Compatibility is not broken, because we forward it
as a named request attribute, not with a new byte
encoded name.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1661067 13f79535-47bb-0310-9956-ffa450edef68
2015-02-20 07:27:44 +00:00
7947f59a38
Typo
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1661064 13f79535-47bb-0310-9956-ffa450edef68
2015-02-20 06:51:39 +00:00
b8e33f6f61
Save a few bytes in conf pool.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1660800 13f79535-47bb-0310-9956-ffa450edef68
2015-02-19 06:37:21 +00:00
3bfacf36ca
Fix doc as spotted by Chris in online doc
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1660189 13f79535-47bb-0310-9956-ffa450edef68
2015-02-16 19:42:50 +00:00
ebb29bd4bf
Rebuild
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1659961 13f79535-47bb-0310-9956-ffa450edef68
2015-02-15 18:03:39 +00:00
