]> granicus.if.org Git - apache/log
apache
9 years agoFollowup to r1667385, my sandbox was out of date.
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

9 years agoRetry ENOENT like ECONNREFUSED, but only near a server restart.
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

9 years agocore: Cleanup the request soon/even if some output filter fails to
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

9 years agoRebuild.
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

9 years agoXML updates.
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

9 years agompm_motorz: follow up to r1666482.
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

9 years agompm_event: follow up to r1666468.
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

9 years ago.gdbinit: Add dump_skiplist.
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

9 years agowork w/ apr_skiplist_insert()
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

9 years agompm_event: Allow for timer events duplicates.
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

9 years agoChoose "-D" instead of "-d" for the rotatelogs
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

9 years agoSmall changes to rotatelogs:
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

9 years ago* mod_ssl: fix small memory leak in ssl_init_server_certs when ECDH is used.
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

9 years agoAvoid a potential integer underflow in the lock timeout value sent back to a client...
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

9 years agossl_util: Fix possible crash (free => OPENSSL_free) and error path leaks when
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

9 years agoFix doc as spotted by Sven in online doc
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

9 years agoCHANGES: remove backported entries.
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

9 years agoCHANGES: follow up to r1656259 and r1665625.
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

9 years agoap_die(): follow up to r1657881.
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

9 years agocore, modules: like r1657897 but for core and other modules than mod_proxy.
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

9 years agomotorz: add and use the timer event of the connection.
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

9 years agomotorz: revert bogus r1665381.
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

9 years agomotorz:
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

9 years agouse pollset impl instead of pollcb
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

9 years agowe need sbh and might as well have some debug
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

9 years agomod_proxy: follow up to r1665215: CHANGES entry.
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

9 years ago* mod_cache: Preserve the Content-Type in case of 304 response.
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

9 years agomod_proxy: use the original (non absolute) form of the request-line's URI
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

9 years agoRebuild.
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

9 years agoXML updates.
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

9 years ago * Do not reset the retry timeout if the worker is in error at this stage even
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

9 years agocore: Follow up to r1664205.
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

9 years agoBetter documentation for RewriteMap MapTypeOptions (r1664565)
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

9 years ago*) mod_rewrite: Add support for starting External Rewriting Programs
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

9 years agoSome fluff
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

9 years agoHmmm... why did git miss this?
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

9 years agoMove statics
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

9 years agoFix errors and mistakenly removed rets
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

9 years agoDon't return
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

9 years agoMove to traditional C header
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

9 years agoFresheh html
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

9 years agocore: Follow up to r1664071: comments on new keep_alive_timeout_set flag.
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

9 years ago* Setup the usual svn:ignore properties for MPM's
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

9 years ago *) SECURITY: CVE-2015-0253 (cve.mitre.org)
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

9 years ago* Fix typo in error message
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

9 years agobackported
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

9 years agobackported
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

9 years agoWe no longer need eventopt.
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

9 years agocore: If explicitly configured, use the KeepaliveTimeout value of the
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

9 years ago* mod_authn_dbd: apr_pstrdup dbd_password and dbd_hash to fix use-after-free
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

9 years agoPR54613: protect the invoke_mtx with #if APR_HAS_THREADS.
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

9 years agoUpdate.
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

9 years agomod_authn_core: Add expression support to AuthName and AuthType.
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

9 years agompm_event: follow up to r1538490, r1545736, r1604350, r1639614 and r1642868.
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

9 years agoRebuild.
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

9 years agoXML updates.
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

9 years agoRemove some backported entries
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

9 years agompm_event: follow up to r1493741 and r1662440.
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

9 years agompm_event: follow up to r1493741.
Yann Ylavic [Thu, 26 Feb 2015 13:16:19 +0000 (13:16 +0000)]
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

9 years agompm_{worker,prefork}: save some cycles by not copying the listener's pollfds
Yann Ylavic [Thu, 26 Feb 2015 12:54:23 +0000 (12:54 +0000)]
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

9 years agoCHANGES: follow up to r1662245: Add PR number.
Yann Ylavic [Wed, 25 Feb 2015 15:46:03 +0000 (15:46 +0000)]
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

9 years agomod_deflate: follow up to r1619383 and r1619444: CHANGES entry.
Yann Ylavic [Wed, 25 Feb 2015 15:39:36 +0000 (15:39 +0000)]
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

9 years agoxforms
Eric Covener [Tue, 24 Feb 2015 16:43:37 +0000 (16:43 +0000)]
xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1662013 13f79535-47bb-0310-9956-ffa450edef68

9 years agoimprove some slightly awkward wording per comments feedback:
Eric Covener [Tue, 24 Feb 2015 16:43:31 +0000 (16:43 +0000)]
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

9 years agoab: Add missing longest request (100%) to CSV export.
Yann Ylavic [Tue, 24 Feb 2015 12:14:05 +0000 (12:14 +0000)]
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

9 years agomod_ssl_ct needs a per-vhost module config even if a vhost
Jeff Trawick [Sun, 22 Feb 2015 20:12:26 +0000 (20:12 +0000)]
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

9 years agoxform
Jeff Trawick [Sun, 22 Feb 2015 16:29:54 +0000 (16:29 +0000)]
xform

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1661491 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRefer to a tool from Tom Ritter for storing an SCT in a form
Jeff Trawick [Sun, 22 Feb 2015 16:28:48 +0000 (16:28 +0000)]
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

9 years agoFollow-up to r1661487:
Jeff Trawick [Sun, 22 Feb 2015 16:10:02 +0000 (16:10 +0000)]
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

9 years agoProvide separate SSL_CT_*_STATUS variables for client vs. proxy
Jeff Trawick [Sun, 22 Feb 2015 15:50:54 +0000 (15:50 +0000)]
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

9 years agoaxe unused variables
Jeff Trawick [Sun, 22 Feb 2015 15:32:48 +0000 (15:32 +0000)]
axe unused variables

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1661486 13f79535-47bb-0310-9956-ffa450edef68

9 years agoxforms
Stefan Fritsch [Sun, 22 Feb 2015 09:45:37 +0000 (09:45 +0000)]
xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1661465 13f79535-47bb-0310-9956-ffa450edef68

9 years agoMention notable things added in 2.4.x
Stefan Fritsch [Sun, 22 Feb 2015 09:31:51 +0000 (09:31 +0000)]
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

9 years agoBackported
Christophe Jaillet [Sun, 22 Feb 2015 07:45:10 +0000 (07:45 +0000)]
Backported

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1661457 13f79535-47bb-0310-9956-ffa450edef68

9 years agocore: Add expression support to ErrorDocument. Switch from a fixed
Graham Leggett [Sat, 21 Feb 2015 23:59:05 +0000 (23:59 +0000)]
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

9 years agoRebuild.
Lucien Gentis [Sat, 21 Feb 2015 17:18:40 +0000 (17:18 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1661407 13f79535-47bb-0310-9956-ffa450edef68

9 years agoXML updates.
Lucien Gentis [Sat, 21 Feb 2015 17:17:45 +0000 (17:17 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1661406 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild.
Lucien Gentis [Sat, 21 Feb 2015 17:12:57 +0000 (17:12 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1661405 13f79535-47bb-0310-9956-ffa450edef68

9 years agoXML updates.
Lucien Gentis [Sat, 21 Feb 2015 17:10:40 +0000 (17:10 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1661404 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_ssl: Add the SSL_CLIENT_CERT_RFC4523_CEA variable, which provides
Graham Leggett [Sat, 21 Feb 2015 00:33:34 +0000 (00:33 +0000)]
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

9 years agomod_proxy_ajp: Forward SSL_PROTOCOL. Forthcoming
Rainer Jung [Fri, 20 Feb 2015 07:27:44 +0000 (07:27 +0000)]
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

9 years agoTypo
Christophe Jaillet [Fri, 20 Feb 2015 06:51:39 +0000 (06:51 +0000)]
Typo

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1661064 13f79535-47bb-0310-9956-ffa450edef68

9 years agoSave a few bytes in conf pool.
Christophe Jaillet [Thu, 19 Feb 2015 06:37:21 +0000 (06:37 +0000)]
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

9 years agoFix doc as spotted by Chris in online doc
Christophe Jaillet [Mon, 16 Feb 2015 19:42:50 +0000 (19:42 +0000)]
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

9 years agoRebuild
Lucien Gentis [Sun, 15 Feb 2015 18:03:39 +0000 (18:03 +0000)]
Rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1659961 13f79535-47bb-0310-9956-ffa450edef68

9 years agoReplacing before-name="no" by before-name="yes"
Lucien Gentis [Sun, 15 Feb 2015 17:59:14 +0000 (17:59 +0000)]
Replacing before-name="no" by before-name="yes"

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1659960 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild without modifying lang/fr.xml
Lucien Gentis [Sun, 15 Feb 2015 17:57:10 +0000 (17:57 +0000)]
Rebuild without modifying lang/fr.xml

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1659959 13f79535-47bb-0310-9956-ffa450edef68

9 years agoSynch some compatibility notes with 2.4.x
Christophe Jaillet [Sun, 15 Feb 2015 09:16:31 +0000 (09:16 +0000)]
Synch some compatibility notes with 2.4.x

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1659902 13f79535-47bb-0310-9956-ffa450edef68

9 years agoallow placing the 'directive' word before the directive name in the module synopsis.
André Malo [Sat, 14 Feb 2015 20:07:46 +0000 (20:07 +0000)]
allow placing the 'directive' word before the directive name in the module synopsis.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1659855 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFix doc as spotted by Andrew Stayart in online doc
Christophe Jaillet [Sat, 14 Feb 2015 19:40:16 +0000 (19:40 +0000)]
Fix doc as spotted by Andrew Stayart  in online doc
+ be consistent with the position of '*'

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1659848 13f79535-47bb-0310-9956-ffa450edef68

9 years agoupdate transformation
André Malo [Sat, 14 Feb 2015 19:17:20 +0000 (19:17 +0000)]
update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1659846 13f79535-47bb-0310-9956-ffa450edef68

9 years agotypoes
Eric Covener [Sat, 14 Feb 2015 18:29:29 +0000 (18:29 +0000)]
typoes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1659837 13f79535-47bb-0310-9956-ffa450edef68

9 years agosuexec: Filter out HTTP_PROXY
Stefan Fritsch [Fri, 13 Feb 2015 23:24:10 +0000 (23:24 +0000)]
suexec: Filter out HTTP_PROXY

Some programs look there for the http proxy server.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1659711 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_proxy_http: Use the "Connection: close" header for requests to
Yann Ylavic [Tue, 10 Feb 2015 17:25:54 +0000 (17:25 +0000)]
mod_proxy_http: Use the "Connection: close" header for requests to
backends not recycling connections (disablereuse), including the default
reverse and forward proxies.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1658765 13f79535-47bb-0310-9956-ffa450edef68

9 years agomod_proxy_http: Don't expect the backend to ack the "Connection: close" to
Yann Ylavic [Tue, 10 Feb 2015 17:03:05 +0000 (17:03 +0000)]
mod_proxy_http: Don't expect the backend to ack the "Connection: close" to
finally close those not meant to be kept alive by SetEnv proxy-nokeepalive
or force-proxy-request-1.0, and respond with 502 instead of 400 if its
Connection header is invalid.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1658760 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFix a precedence issue.
Christophe Jaillet [Mon, 9 Feb 2015 20:32:18 +0000 (20:32 +0000)]
Fix a precedence issue.
The logic is unchanged but 'ret' does not have the expected value. So the logged error message may be incorrect.

+ add some empty lines between functions

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1658567 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild.
Lucien Gentis [Sat, 7 Feb 2015 16:48:12 +0000 (16:48 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1658073 13f79535-47bb-0310-9956-ffa450edef68

9 years agoXML updates.
Lucien Gentis [Sat, 7 Feb 2015 16:45:22 +0000 (16:45 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1658072 13f79535-47bb-0310-9956-ffa450edef68

9 years agoThis 2 includes are not needed anymore.
Christophe Jaillet [Fri, 6 Feb 2015 21:14:29 +0000 (21:14 +0000)]
This 2 includes are not needed anymore.
They were added in r1542732.

The need of apr_version.h has been removed in r1561200.
The need of apr_hash.h has been removed in r1561211.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1657965 13f79535-47bb-0310-9956-ffa450edef68

9 years agoTab vs space
Christophe Jaillet [Fri, 6 Feb 2015 20:25:21 +0000 (20:25 +0000)]
Tab vs space

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1657949 13f79535-47bb-0310-9956-ffa450edef68