]>
granicus.if.org Git - apache/log
Eric Covener [Tue, 7 Apr 2015 19:01:16 +0000 (19:01 +0000)]
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
Yann Ylavic [Sun, 5 Apr 2015 19:22:24 +0000 (19:22 +0000)]
CHANGES: remove entries merged into 2.4.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1671419 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 5 Apr 2015 13:54:22 +0000 (13:54 +0000)]
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
Rainer Jung [Sun, 5 Apr 2015 13:34:01 +0000 (13:34 +0000)]
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
Rainer Jung [Sun, 5 Apr 2015 13:12:38 +0000 (13:12 +0000)]
Followup to r1670431,
1670432 ,
1670440
and
1670738 : update max APLOGNO number.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1671394 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 5 Apr 2015 01:10:37 +0000 (01:10 +0000)]
Mention the cmake/OpenSSL compatibility issue
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1671364 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 2 Apr 2015 01:50:45 +0000 (01:50 +0000)]
Not that hard to explain...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1670805 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 1 Apr 2015 17:18:59 +0000 (17:18 +0000)]
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
Graham Leggett [Wed, 1 Apr 2015 10:03:56 +0000 (10:03 +0000)]
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
Ruediger Pluem [Wed, 1 Apr 2015 08:34:31 +0000 (08:34 +0000)]
* 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
Jim Jagielski [Tue, 31 Mar 2015 19:23:11 +0000 (19:23 +0000)]
And the lognos
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1670440 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 31 Mar 2015 19:20:02 +0000 (19:20 +0000)]
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
Rainer Jung [Tue, 31 Mar 2015 19:15:32 +0000 (19:15 +0000)]
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
Jim Jagielski [Tue, 31 Mar 2015 19:12:08 +0000 (19:12 +0000)]
More ALPN goodness
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1670434 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 31 Mar 2015 19:09:12 +0000 (19:09 +0000)]
Followup to r1670397: add missing APLOGNO.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1670432 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 31 Mar 2015 19:07:11 +0000 (19:07 +0000)]
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
Jim Jagielski [Tue, 31 Mar 2015 17:12:51 +0000 (17:12 +0000)]
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
Lucien Gentis [Sat, 28 Mar 2015 15:08:14 +0000 (15:08 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1669784 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 28 Mar 2015 15:07:31 +0000 (15:07 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1669783 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 28 Mar 2015 15:04:42 +0000 (15:04 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1669781 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 28 Mar 2015 15:02:50 +0000 (15:02 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1669780 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 27 Mar 2015 20:46:11 +0000 (20:46 +0000)]
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
Christophe Jaillet [Thu, 26 Mar 2015 22:12:14 +0000 (22:12 +0000)]
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
Yann Ylavic [Thu, 26 Mar 2015 09:07:54 +0000 (09:07 +0000)]
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
Yann Ylavic [Thu, 26 Mar 2015 08:28:20 +0000 (08:28 +0000)]
CHANGES: follow up to r1669289.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1669292 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 26 Mar 2015 08:15:32 +0000 (08:15 +0000)]
core_filters: restore/disable TCP_NOPUSH option after non-blocking sendfile.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1669289 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 25 Mar 2015 18:39:32 +0000 (18:39 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1669202 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 25 Mar 2015 18:36:16 +0000 (18:36 +0000)]
Suggestion to see mod_substitute, as per
http://httpd.apache.org/docs/2.2/mod/mod_ext_filter.html#comment_3822
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1669200 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 25 Mar 2015 15:00:37 +0000 (15:00 +0000)]
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
Eric Covener [Tue, 24 Mar 2015 13:12:42 +0000 (13:12 +0000)]
backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1668882 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 24 Mar 2015 13:11:51 +0000 (13:11 +0000)]
backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1668881 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 24 Mar 2015 13:06:33 +0000 (13:06 +0000)]
xform
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1668876 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 24 Mar 2015 13:06:12 +0000 (13:06 +0000)]
close tag
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1668875 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 24 Mar 2015 13:04:07 +0000 (13:04 +0000)]
trunkify
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1668871 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Tue, 24 Mar 2015 09:13:12 +0000 (09:13 +0000)]
* 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
Yann Ylavic [Mon, 23 Mar 2015 08:52:47 +0000 (08:52 +0000)]
core: follow up to r1668532: always initialize optional_fn pointers in ap_create_scoreboard().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1668553 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 23 Mar 2015 08:15:24 +0000 (08:15 +0000)]
core: follow up to r1668532: CHANGES entry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1668535 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 23 Mar 2015 08:07:18 +0000 (08:07 +0000)]
core: Initialize scoreboard's used optional functions on graceful restarts to
avoid a crash when relocation occurs. PR 57177.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1668532 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 22 Mar 2015 14:12:09 +0000 (14:12 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1668377 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 22 Mar 2015 14:11:00 +0000 (14:11 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1668376 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Thu, 19 Mar 2015 11:29:55 +0000 (11:29 +0000)]
* 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
Jan Kaluža [Thu, 19 Mar 2015 07:46:35 +0000 (07:46 +0000)]
* 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
Eric Covener [Tue, 17 Mar 2015 20:13:39 +0000 (20:13 +0000)]
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
Eric Covener [Tue, 17 Mar 2015 20:12:19 +0000 (20:12 +0000)]
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
Yann Ylavic [Mon, 16 Mar 2015 13:52:39 +0000 (13:52 +0000)]
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
Lucien Gentis [Sat, 14 Mar 2015 16:28:53 +0000 (16:28 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1666710 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 14 Mar 2015 16:27:54 +0000 (16:27 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1666709 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 14 Mar 2015 00:09:32 +0000 (00:09 +0000)]
mpm_motorz: follow up to r1666482.
We only need one compare function for add semantic with apr_skiplist_insert()
and unique timers (pointers). It also works with apr_skiplist_remove() and
apr_skiplist_find().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1666619 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 14 Mar 2015 00:06:21 +0000 (00:06 +0000)]
mpm_event: follow up to r1666468.
We only need one compare function for add semantic with apr_skiplist_insert()
and unique timers (pointers). It also should work with apr_skiplist_remove()
and apr_skiplist_find(), be they used some day.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1666618 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 13 Mar 2015 23:59:42 +0000 (23:59 +0000)]
.gdbinit: Add dump_skiplist.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1666617 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 13 Mar 2015 15:27:36 +0000 (15:27 +0000)]
work w/ apr_skiplist_insert()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1666482 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 13 Mar 2015 14:47:50 +0000 (14:47 +0000)]
mpm_event: Allow for timer events duplicates.
Meanwhile ap[r]_skiplist_add()...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1666468 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 13 Mar 2015 12:24:17 +0000 (12:24 +0000)]
Choose "-D" instead of "-d" for the rotatelogs
option that creates the path to the log file.
I want to use "-d" for another directory related
option next where (I think) the "directory" "d"
makes more sense.
"-d" has not yet been backported, so changing
to "-D" is not a real compatibility issue.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1666417 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 13 Mar 2015 12:15:40 +0000 (12:15 +0000)]
Small changes to rotatelogs:
- add "-n num" to help text
- clarify in help text, that "program is invoked"
is the "-p" case
- prevent crash with "-v" (verbose) if no
"-p prog" is used
- add one space for formatting
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1666415 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Fri, 13 Mar 2015 07:32:46 +0000 (07:32 +0000)]
* 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
Christophe Jaillet [Fri, 13 Mar 2015 07:21:10 +0000 (07:21 +0000)]
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
Yann Ylavic [Thu, 12 Mar 2015 20:50:09 +0000 (20:50 +0000)]
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
Christophe Jaillet [Wed, 11 Mar 2015 22:10:59 +0000 (22:10 +0000)]
Fix doc as spotted by Sven in online doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1666025 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 11 Mar 2015 00:42:08 +0000 (00:42 +0000)]
CHANGES: remove backported entries.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1665747 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 10 Mar 2015 22:06:30 +0000 (22:06 +0000)]
CHANGES: follow up to r1656259 and r1665625.
Merge both commits into a single entry to ease common backport.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1665721 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 10 Mar 2015 17:58:01 +0000 (17:58 +0000)]
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
Yann Ylavic [Tue, 10 Mar 2015 17:25:17 +0000 (17:25 +0000)]
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
Yann Ylavic [Tue, 10 Mar 2015 12:09:34 +0000 (12:09 +0000)]
motorz: add and use the timer event of the connection.
Set current_thread before calling timer callback.
Use KeepAliveTimeout for CONN_STATE_CHECK_REQUEST_LINE_READABLE.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1665495 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 9 Mar 2015 23:39:05 +0000 (23:39 +0000)]
motorz: revert bogus r1665381.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1665385 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 9 Mar 2015 23:11:45 +0000 (23:11 +0000)]
motorz:
Fix access to timer's pool from different threads (timer_event_process).
Set current_thread before calling timer callback.
Reuse timers by using spare_timers from motorz core (acquire/release_timer).
Use KeepAliveTimeout for CONN_STATE_CHECK_REQUEST_LINE_READABLE.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1665381 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 9 Mar 2015 18:26:13 +0000 (18:26 +0000)]
use pollset impl instead of pollcb
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1665317 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 9 Mar 2015 15:59:29 +0000 (15:59 +0000)]
we need sbh and might as well have some debug
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1665270 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 9 Mar 2015 12:54:38 +0000 (12:54 +0000)]
mod_proxy: follow up to r1665215: CHANGES entry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1665218 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Mon, 9 Mar 2015 12:48:11 +0000 (12:48 +0000)]
* 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
Yann Ylavic [Mon, 9 Mar 2015 12:45:56 +0000 (12:45 +0000)]
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
Lucien Gentis [Sat, 7 Mar 2015 15:19:40 +0000 (15:19 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1664867 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 7 Mar 2015 15:18:34 +0000 (15:18 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1664865 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 6 Mar 2015 19:31:42 +0000 (19:31 +0000)]
* 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
Yann Ylavic [Fri, 6 Mar 2015 09:55:16 +0000 (09:55 +0000)]
core: Follow up to r1664205.
Don't let invalid r->proto_num/protocol out of read_request_line() reach
the output filters (when responding with 400 Bad Request).
Suggested by: rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1664576 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Fri, 6 Mar 2015 09:53:40 +0000 (09:53 +0000)]
Better documentation for RewriteMap MapTypeOptions (r1664565)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1664575 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Fri, 6 Mar 2015 09:14:07 +0000 (09:14 +0000)]
*) 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
Jim Jagielski [Thu, 5 Mar 2015 20:36:29 +0000 (20:36 +0000)]
Some fluff
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1664478 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 5 Mar 2015 18:56:05 +0000 (18:56 +0000)]
Hmmm... why did git miss this?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1664456 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 5 Mar 2015 18:39:55 +0000 (18:39 +0000)]
Move statics
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1664449 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 5 Mar 2015 18:16:47 +0000 (18:16 +0000)]
Fix errors and mistakenly removed rets
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1664443 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 5 Mar 2015 14:35:39 +0000 (14:35 +0000)]
Don't return
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1664358 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 5 Mar 2015 14:35:37 +0000 (14:35 +0000)]
Move to traditional C header
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1664357 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 5 Mar 2015 14:35:34 +0000 (14:35 +0000)]
Fresheh html
BUGZ:55466
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1664356 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 5 Mar 2015 10:41:19 +0000 (10:41 +0000)]
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
Ruediger Pluem [Thu, 5 Mar 2015 09:03:56 +0000 (09:03 +0000)]
* 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
Eric Covener [Thu, 5 Mar 2015 02:33:16 +0000 (02:33 +0000)]
*) 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
Ruediger Pluem [Wed, 4 Mar 2015 20:16:34 +0000 (20:16 +0000)]
* Fix typo in error message
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1664133 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 4 Mar 2015 19:22:37 +0000 (19:22 +0000)]
backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1664123 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 4 Mar 2015 19:22:14 +0000 (19:22 +0000)]
backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1664122 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 4 Mar 2015 17:17:53 +0000 (17:17 +0000)]
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
Yann Ylavic [Wed, 4 Mar 2015 16:58:01 +0000 (16:58 +0000)]
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
Jan Kaluža [Tue, 3 Mar 2015 11:12:18 +0000 (11:12 +0000)]
* 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
Eric Covener [Mon, 2 Mar 2015 17:47:43 +0000 (17:47 +0000)]
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
Graham Leggett [Sun, 1 Mar 2015 14:37:40 +0000 (14:37 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1663124 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 1 Mar 2015 14:37:11 +0000 (14:37 +0000)]
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
Yann Ylavic [Sun, 1 Mar 2015 00:44:49 +0000 (00:44 +0000)]
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
Lucien Gentis [Sat, 28 Feb 2015 16:20:35 +0000 (16:20 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1662959 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 28 Feb 2015 16:19:28 +0000 (16:19 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1662958 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 27 Feb 2015 06:39:15 +0000 (06:39 +0000)]
Remove some backported entries
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1662642 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 26 Feb 2015 13:18:10 +0000 (13:18 +0000)]
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