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

9167 Commits

Author SHA1 Message Date
Eric Covener
de91f95a16 libressl fix for removed ENGINE_CTRL_CHIL_SET_FORKCHECK
Submitted By: Stuart Henderson <sthen openbsd.org>
Commited By: covener




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673455 13f79535-47bb-0310-9956-ffa450edef68
2015-04-14 15:56:30 +00:00
Christophe Jaillet
593715fd4a Remove some spaces between some return statements and ';' + fix a strange formating in a 'for' loop
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673368 13f79535-47bb-0310-9956-ffa450edef68
2015-04-14 06:03:13 +00:00
Christophe Jaillet
3bf5f06197 Use 'unsigned int' in bitfield
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673113 13f79535-47bb-0310-9956-ffa450edef68
2015-04-13 05:59:26 +00:00
Christophe Jaillet
2705372157 Tweak log message
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1672985 13f79535-47bb-0310-9956-ffa450edef68
2015-04-12 06:57:07 +00:00
Rainer Jung
9c70146b34 More followon to r1671397 for proxy server-status
in auto mode:
- remove remaining HTML markup


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1672564 13f79535-47bb-0310-9956-ffa450edef68
2015-04-10 06:55:48 +00:00
Rainer Jung
bc86b132b5 Followon to r1671397 for proxy server-status
in auto mode:
- don't show HTML legend
- Show correct worker name


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1672466 13f79535-47bb-0310-9956-ffa450edef68
2015-04-09 19:20:14 +00:00
Rainer Jung
837652cd3b Followon to r1671396: add misiing newline in
new server-status output.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1672453 13f79535-47bb-0310-9956-ffa450edef68
2015-04-09 18:59:43 +00:00
Rainer Jung
65c97d7d92 Followon to r1671396:
Remove unwanted redundant output introduced
by that commit.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1672289 13f79535-47bb-0310-9956-ffa450edef68
2015-04-09 10:54:26 +00:00
Eric Covener
ef2d04f0f3 allow time to first byte (of response headers)
to be logged by mod_logio.  

mod_logio was just a conveninent place to do this 
w/o writing a new filter or complicating an existing 
important one.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1671918 13f79535-47bb-0310-9956-ffa450edef68
2015-04-07 19:01:16 +00:00
Rainer Jung
0c12000aed Add output for "?auto" version of server-status
to proxy status, mod_ssl session cache info,
mod_cache_socache and the status hook of the
individual socache implementations.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1671397 13f79535-47bb-0310-9956-ffa450edef68
2015-04-05 13:54:22 +00:00
Rainer Jung
0450264e71 Add more data to "?auto" view of server-status.
Although mod_status source code calls this the
"short_report", the docs and the API flag call
it "Machine Readable" resp. "STAT_OPT_AUTO".
So IMHO the data shown should be on par with
the html version.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1671396 13f79535-47bb-0310-9956-ffa450edef68
2015-04-05 13:34:01 +00:00
Jim Jagielski
c33564090d Fix issue w/ deterministic ordering and string comparison of "http/1.1." and "h2"
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1670738 13f79535-47bb-0310-9956-ffa450edef68
2015-04-01 17:18:59 +00:00
Graham Leggett
09c4bc62d0 http: Add support for RFC2324/RFC7168.
Sample implementation: http://people.apache.org/~minfrin/mod_teapot.c


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1670594 13f79535-47bb-0310-9956-ffa450edef68
2015-04-01 10:03:56 +00:00
Ruediger Pluem
cd82565218 * ssl_array_index is only used by code inside the HAVE_TLS_ALPN. So silence warnings if don't have it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1670578 13f79535-47bb-0310-9956-ffa450edef68
2015-04-01 08:34:31 +00:00
Jim Jagielski
abf1f3e23f And the lognos
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1670440 13f79535-47bb-0310-9956-ffa450edef68
2015-03-31 19:23:11 +00:00
Rainer Jung
b2f953aa69 Revert r1670436.
Patch was already applied, Jim was quicker.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1670439 13f79535-47bb-0310-9956-ffa450edef68
2015-03-31 19:20:02 +00:00
Rainer Jung
71cf024446 Followup to r1670397+r1670434: even more ALPN goodness.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1670436 13f79535-47bb-0310-9956-ffa450edef68
2015-03-31 19:15:32 +00:00
Jim Jagielski
7a99991874 More ALPN goodness
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1670434 13f79535-47bb-0310-9956-ffa450edef68
2015-03-31 19:12:08 +00:00
Rainer Jung
31c3573052 Followup to r1670397: add missing APLOGNO.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1670432 13f79535-47bb-0310-9956-ffa450edef68
2015-03-31 19:09:12 +00:00
Rainer Jung
bc41580632 Add missing APLOGNOs by running
docs/log-message-tags/update-log-msg-tags.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1670431 13f79535-47bb-0310-9956-ffa450edef68
2015-03-31 19:07:11 +00:00
Jim Jagielski
17565ac48c ALPN support, based on mod_spdy/mod_h2 patch set
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1670397 13f79535-47bb-0310-9956-ffa450edef68
2015-03-31 17:12:51 +00:00
William A. Rowe Jr
776ab659a6 Correct MS-DOS check-in crap on text files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1669682 13f79535-47bb-0310-9956-ffa450edef68
2015-03-27 20:46:11 +00:00
Christophe Jaillet
6c3c048b7a s/apr_pstrndup/apr_pstrmemdup/ when applicable
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1669461 13f79535-47bb-0310-9956-ffa450edef68
2015-03-26 22:12:14 +00:00
Yann Ylavic
94610cc166 mod_proxy_wstunnel: Avoid an empty response by failing with 502 (Bad Gateway)
when no response is ever received from the backend.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1669299 13f79535-47bb-0310-9956-ffa450edef68
2015-03-26 09:07:54 +00:00
Yann Ylavic
549749d283 mod_proxy_{connect,wstunnel}: follow up to r1657636.
Since rv is not used as an apr_status_t in the loop (it's logging is done by
proxy_{connect,wstunnel}_transfer() when necessary/relevent), use a boolean
instead to avoid the ugly ORs between APR error codes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1669130 13f79535-47bb-0310-9956-ffa450edef68
2015-03-25 15:00:37 +00:00
Jan Kaluža
eca303e318 * mod_lua: fix compilation with lua-5.3
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1668827 13f79535-47bb-0310-9956-ffa450edef68
2015-03-24 09:13:12 +00:00
Jan Kaluža
fd61b03b75 * mod_proxy: Allow setting options to globally defined balancer from
ProxyPass used in VirtualHost. Balancers are now merged using the new
  merge_balancers method which merges the balancers options.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1667707 13f79535-47bb-0310-9956-ffa450edef68
2015-03-19 11:29:55 +00:00
Jan Kaluža
29e741e0d9 * mod_access_compat, mod_authz_host: Handle '#' character.
For mod_access_compat, disable '#' in hostname completely.
For mod_authz_host, treat '#' as a comment and ignore everything after that.
This allows better handling of admin errors like
'Require host localhost# Add example.com later'.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1667676 13f79535-47bb-0310-9956-ffa450edef68
2015-03-19 07:46:35 +00:00
Eric Covener
280ed85190 Followup to r1667385, my sandbox was out of date.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1667386 13f79535-47bb-0310-9956-ffa450edef68
2015-03-17 20:13:39 +00:00
Eric Covener
c27569bfd3 Retry ENOENT like ECONNREFUSED, but only near a server restart.
PR57685

Submitted By: Edward Lu
Committed By: covener




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1667385 13f79535-47bb-0310-9956-ffa450edef68
2015-03-17 20:12:19 +00:00
Yann Ylavic
f6090114a8 core: Cleanup the request soon/even if some output filter fails to
handle the EOR bucket.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1666998 13f79535-47bb-0310-9956-ffa450edef68
2015-03-16 13:52:39 +00:00
Jan Kaluža
2c379ac463 * mod_ssl: fix small memory leak in ssl_init_server_certs when ECDH is used.
SSL_CTX_set_tmp_ecdh increases reference count, so we have to call EC_KEY_free,
otherwise eckey will not be freed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1666363 13f79535-47bb-0310-9956-ffa450edef68
2015-03-13 07:32:46 +00:00
Christophe Jaillet
71e93ff17b Avoid a potential integer underflow in the lock timeout value sent back to a client. The answer to a LOCK request could be an extremly large integer if the time needed to lock the resource was longer that the requested timeout given in the LOCK request. In such a case, we now answer "Second-0". PR55420
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1666361 13f79535-47bb-0310-9956-ffa450edef68
2015-03-13 07:21:10 +00:00
Yann Ylavic
5c4f5c43cc ssl_util: Fix possible crash (free => OPENSSL_free) and error path leaks when
checking the server certificate constraints (SSL_X509_getBC()).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1666297 13f79535-47bb-0310-9956-ffa450edef68
2015-03-12 20:50:09 +00:00
Yann Ylavic
bce39a4336 ap_die(): follow up to r1657881.
Use log level DEBUG for AP_FILTER_ERROR => HTTP_INTERNAL_SERVER_ERROR.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1665643 13f79535-47bb-0310-9956-ffa450edef68
2015-03-10 17:58:01 +00:00
Yann Ylavic
0a431ef862 core, modules: like r1657897 but for core and other modules than mod_proxy.
More uses of ap_map_http_request_error() and AP_FILTER_ERROR so that we never
return an HTTP error status from a handler if some filter generated a response
already.

That is, from a handler, either ap_get_brigade() (an input filter) returned
AP_FILTER_ERROR and we must forward it to ap_die(), or ap_pass_brigade() (an
output filter) failed with any status and we must return AP_FILTER_ERROR in
any case for ap_die() to determine whether a response is needed or not.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1665625 13f79535-47bb-0310-9956-ffa450edef68
2015-03-10 17:25:17 +00:00
Jan Kaluža
53e095830b * mod_cache: Preserve the Content-Type in case of 304 response.
304 does not contain Content-Type and mod_mime regenerates
the Content-Type based on the r->filename. This later leads to original
Content-Type to be lost (overwriten by whatever mod_mime generates).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1665216 13f79535-47bb-0310-9956-ffa450edef68
2015-03-09 12:48:11 +00:00
Yann Ylavic
59240d4951 mod_proxy: use the original (non absolute) form of the request-line's URI
for requests embedded in CONNECT payloads used to connect SSL backends via
a ProxyRemote forward-proxy. PR 55892.

Submitted by: Hendrik Harms <hendrik.harms gmail com>
Reviewed  by: wrowe, ylavic
Committed by: ylavic


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1665215 13f79535-47bb-0310-9956-ffa450edef68
2015-03-09 12:45:56 +00:00
Ruediger Pluem
6864b2c781 * Do not reset the retry timeout if the worker is in error at this stage even
if the connection to the backend was successful. It was likely set into
   error by a different thread / process in parallel e.g. for a timeout or
   bad status. We should respect this and should not continue with a connection
   via this worker even if we got one.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1664709 13f79535-47bb-0310-9956-ffa450edef68
2015-03-06 19:31:42 +00:00
Jan Kaluža
c31475601a *) mod_rewrite: Add support for starting External Rewriting Programs
as non-root user on UNIX systems by specifying username and group name
   as third argument of RewriteMap directive.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1664565 13f79535-47bb-0310-9956-ffa450edef68
2015-03-06 09:14:07 +00:00
Jim Jagielski
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
Jim Jagielski
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
Yann Ylavic
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
Ruediger Pluem
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
Yann Ylavic
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
Jan Kaluža
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
Graham Leggett
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
Jeff Trawick
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
Jeff Trawick
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
Graham Leggett
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