]>
granicus.if.org Git - apache/log
Yann Ylavic [Tue, 17 Jun 2014 14:57:19 +0000 (14:57 +0000)]
Remove backported changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1603192 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 17 Jun 2014 13:07:34 +0000 (13:07 +0000)]
Add missing CHANGES entries for r1572655,
1572663 ,
1572668 -
1572671 ,
1573224 ,
1586745 ,
1587594 ,
1587639 ,
1590509 , r1572092, and r1572896,
1572911 .
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1603156 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 17 Jun 2014 10:37:15 +0000 (10:37 +0000)]
mod_proxy_fcgi: follow up to r1592032.
Also break the outer loop when "sending stdin" fails.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1603122 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 16 Jun 2014 23:57:19 +0000 (23:57 +0000)]
Reindent after small fix in r1603027
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1603029 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 16 Jun 2014 23:56:06 +0000 (23:56 +0000)]
Fix bug introduced in r1591508 which resulted in the final empty
FCGI_STDIN not being sent. Interaction with latest uWSGI (and
probably other protocol implementations) breaks without this.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1603027 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 16 Jun 2014 20:26:24 +0000 (20:26 +0000)]
mod_proxy: Don't limit the size of the connectable Unix Domain Socket paths.
Since connect() to UDS path is used at several places, introduce
ap_proxy_connect_uds() in proxy_util.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1602989 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 16 Jun 2014 19:48:12 +0000 (19:48 +0000)]
Core filters do not need mod_proxy.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1602978 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 16 Jun 2014 09:34:36 +0000 (09:34 +0000)]
Fixed unused "ap_listen_rec *lr;" in prefork_run().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1602827 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 16 Jun 2014 09:28:01 +0000 (09:28 +0000)]
Mark all unused/duplicated/closed child listeners as inactive.
Fix unused "ap_listen_rec *lr;" in worker_run().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1602826 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 15 Jun 2014 20:31:42 +0000 (20:31 +0000)]
html build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1602769 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 15 Jun 2014 20:31:22 +0000 (20:31 +0000)]
metafiles
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1602767 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 15 Jun 2014 20:30:18 +0000 (20:30 +0000)]
Example of loading mpm with LoadModule, and what happens when you do it
wrong.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1602764 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 15 Jun 2014 20:11:32 +0000 (20:11 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1602763 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 15 Jun 2014 20:09:50 +0000 (20:09 +0000)]
Markup errors.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1602761 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 15 Jun 2014 20:05:04 +0000 (20:05 +0000)]
<page> not valid in this context.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1602758 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 15 Jun 2014 20:03:17 +0000 (20:03 +0000)]
More relevant links in the getting started doc.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1602755 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 15 Jun 2014 16:46:24 +0000 (16:46 +0000)]
Stray whitespace
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1602730 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 15 Jun 2014 15:44:08 +0000 (15:44 +0000)]
Should probably move this to something on the docs-project website so
that someone other than me ever actually looks at it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1602709 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 15 Jun 2014 15:20:43 +0000 (15:20 +0000)]
Start slogging through the STATUS file again
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1602704 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 15 Jun 2014 15:20:04 +0000 (15:20 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1602703 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 15 Jun 2014 15:19:01 +0000 (15:19 +0000)]
Kill the "IE on Mac" example. Replace with simpler example.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1602702 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 15 Jun 2014 13:54:55 +0000 (13:54 +0000)]
revert
1602523 , until there is understanding
about what the actual issue and "requirement" are.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1602697 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 15 Jun 2014 13:45:25 +0000 (13:45 +0000)]
Apply patch to spanish error messages, from PR 56214 (Thanks Javier Llorente)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1602693 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 15 Jun 2014 13:33:07 +0000 (13:33 +0000)]
Rebuild quickrefs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1602692 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 15 Jun 2014 13:10:00 +0000 (13:10 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1602686 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 15 Jun 2014 13:08:48 +0000 (13:08 +0000)]
XML Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1602685 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 14 Jun 2014 16:49:57 +0000 (16:49 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1602600 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 14 Jun 2014 16:48:15 +0000 (16:48 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1602599 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Sat, 14 Jun 2014 02:49:35 +0000 (02:49 +0000)]
style fix, no functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1602544 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 13 Jun 2014 21:10:51 +0000 (21:10 +0000)]
Allow for "magic" scheme "auto" which makes the scheme of
the backend worker match whatever the scheme of the
incoming request was...
For example:
ProxyPass / auto://foo.example.com/
If the incoming request is http:.../lala then
the resultant will be http://foo.example.com/lala
If it's wws:.../lolo then we'd send
wws://foo.example.com/lolo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1602523 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 13 Jun 2014 12:38:37 +0000 (12:38 +0000)]
mod_proxy_fcgi iobuffersize support in 2.4.x via r1601749
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1602411 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Fri, 13 Jun 2014 12:30:12 +0000 (12:30 +0000)]
eventMPM:
fix SEGV in the case socket callback was registered
and no timeout function was registered.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1602409 13f79535 -47bb-0310-9956-
ffa450edef68
Ben Reser [Fri, 13 Jun 2014 08:34:05 +0000 (08:34 +0000)]
Fix PR 56480: PROPFIND walker doesn't encode hrefs properly
Reverts r1529559 partially (specifically the dav_xml_escape_uri) bit.
Reverts r1531505 entirely.
* modules/dav/main/mod_dav.c
(dav_xml_escape_uri): Revert the piece of r1529559 that removes the URI
escaping from this function.
* modules/dav/main/props.c
(dav_do_prop_subreq): Escape the URI before doing a sub request with it.
This resolves some properties like getcontenttype from failing to be
returned for files that contain characters that require encoding in their
path.
* modules/dav/main/mod_dav.h
(dav_resource): Note the inconsistency in the documentation.
* modules/dav/fs/repos.c
(dav_fs_get_resource): Don't use the unparsed_uri to set the uri field of
the resource. This is the correct fix for the double encoding in mod_dav_fs
that led to the dav_xml_escape_uri() change and r1531505.
(dav_fs_walker, dav_fs_append_uri): Revert r1531505 changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1602338 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Thu, 12 Jun 2014 03:32:50 +0000 (03:32 +0000)]
Follow up r1601943:
Fix typo. No functional change.
Pointed out by mrumph
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1602058 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 11 Jun 2014 19:30:01 +0000 (19:30 +0000)]
fix AP_IS_DEAULT_HANDLER_NAME
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1601995 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Wed, 11 Jun 2014 16:39:34 +0000 (16:39 +0000)]
Socket event callback now takes pollfd.
User (e.g. mod_proxy_wstunnel) can know
which socket is ready.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1601943 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 11 Jun 2014 14:42:32 +0000 (14:42 +0000)]
mod_ssl: dump SSL IO/state for the write side of the connection(s), like reads.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1601919 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 11 Jun 2014 12:50:29 +0000 (12:50 +0000)]
mod_sed: Reuse ctx->bb in sed_response_filter() and be safe with its
reentrance. The single return point helps to not duplicate cleanup code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1601877 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 11 Jun 2014 11:47:26 +0000 (11:47 +0000)]
mod_sed:
Avoid the call to APR_BUCKET_REMOVE() + apr_bucket_delete() on the
same bucket.
Also, empty the input brigade while looping to avoid the trailing
apr_brigade_cleanup() call (no functional change).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1601864 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 10 Jun 2014 17:39:24 +0000 (17:39 +0000)]
Fix ab's r1601076 changelog credits.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1601700 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 10 Jun 2014 16:46:57 +0000 (16:46 +0000)]
Add ab's r1601076 changelog.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1601680 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 10 Jun 2014 13:23:20 +0000 (13:23 +0000)]
mod_proxy: follow up to r1601291.
Since deferred_write_pool is needed by the core_output_filter and is a subpool
of the connection, shutdown in a pre_cleanup of the connection's pool to avoid
a freed memory access (SEGV).
Reported By: takashi
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1601630 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 10 Jun 2014 12:44:15 +0000 (12:44 +0000)]
Strip useless apr_brigade_cleanup() calls.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1601624 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Tue, 10 Jun 2014 11:21:22 +0000 (11:21 +0000)]
* apr_status_t vs HTTP status code fix
* use APR_STATUS_IS_ENOTIMPL rather than direct comparison
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1601604 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Tue, 10 Jun 2014 11:08:43 +0000 (11:08 +0000)]
Private function doesn't need ap_ prefix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1601603 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Tue, 10 Jun 2014 07:07:36 +0000 (07:07 +0000)]
follow up r1599012:
C99 fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1601559 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Tue, 10 Jun 2014 07:05:06 +0000 (07:05 +0000)]
follow up r1599531 and r1599593:
C99fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1601558 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 10 Jun 2014 05:58:07 +0000 (05:58 +0000)]
Remove one backported change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1601549 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 10 Jun 2014 00:02:02 +0000 (00:02 +0000)]
simplify/clarify that negation operates on an entire condition and not
on the regex or the special test conditions. Comment #1291.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1601532 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 9 Jun 2014 01:03:39 +0000 (01:03 +0000)]
mod_proxy: Shutdown (eg. SSL close notify) the backend connection
before closing.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1601291 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 9 Jun 2014 00:59:04 +0000 (00:59 +0000)]
Revert r1601285 and r1601283.
Shouldn't have commited the latter without disussing it on dev@.
Since the former creates upper APLOGNOs, revert and then recommit with the reverted next tag number.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1601290 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 9 Jun 2014 00:23:16 +0000 (00:23 +0000)]
mod_proxy: Shutdown (eg. close notify) the backend connection before closing.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1601285 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 9 Jun 2014 00:15:30 +0000 (00:15 +0000)]
eventopt: fix duplicated APLOGNOs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1601283 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 9 Jun 2014 00:05:09 +0000 (00:05 +0000)]
core: Update empty log tags.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1601281 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 8 Jun 2014 23:54:58 +0000 (23:54 +0000)]
mod_ssl: SSL_smart_shutdown(): follow up to r1601184.
Use SSL_get_wbio() to comply with OPENSSL_NO_SSL_INTERN.
Stop SSL shutdown loop when flush fails.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1601274 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 7 Jun 2014 22:57:08 +0000 (22:57 +0000)]
mpm_event[opt]: Send the SSL close notify alert when the KeepAliveTimeout
expires. PR54998.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1601185 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 7 Jun 2014 22:53:52 +0000 (22:53 +0000)]
mod_ssl: Ensure that the SSL close notify alert is flushed to the client.
PR54998.
Submitted By: Tim Kosse <tim.kosse filezilla-project.org>, ylavic
Committed By: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1601184 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 7 Jun 2014 22:24:59 +0000 (22:24 +0000)]
-MPMs event & eventopt: child listeners are used in ONE_PROCESS mode too.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1601171 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 7 Jun 2014 22:04:48 +0000 (22:04 +0000)]
-MPMs prefork & worker: avoid segfault with SAFE_ACCEPT in ONE_PROCESS mode.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1601170 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 7 Jun 2014 08:45:56 +0000 (08:45 +0000)]
ab: support custom HTTP method with -m argument. PR 56604.
Example: ab -n 1 -m PING http://127.0.0.1/
Submitted By: Roman Jurkov <winfinit gmail com>
Committed By: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1601076 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 7 Jun 2014 04:57:44 +0000 (04:57 +0000)]
Typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1601058 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 5 Jun 2014 13:38:08 +0000 (13:38 +0000)]
fix restart issues
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1600656 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Wed, 4 Jun 2014 23:35:59 +0000 (23:35 +0000)]
generated changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1600541 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Wed, 4 Jun 2014 23:30:52 +0000 (23:30 +0000)]
Fix spelling and grammar errors.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1600539 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Wed, 4 Jun 2014 17:42:30 +0000 (17:42 +0000)]
generated changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1600388 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Wed, 4 Jun 2014 17:39:03 +0000 (17:39 +0000)]
Remove redundant paragraph and fix grammar errors.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1600383 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Wed, 4 Jun 2014 17:16:59 +0000 (17:16 +0000)]
generated changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1600358 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 4 Jun 2014 03:14:21 +0000 (03:14 +0000)]
Fix URL in doxygen comment.
Previous link was broken.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1599852 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Wed, 4 Jun 2014 00:28:45 +0000 (00:28 +0000)]
Fix spelling and grammar errors.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1599841 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Wed, 4 Jun 2014 00:02:31 +0000 (00:02 +0000)]
Generated files from doc build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1599840 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 3 Jun 2014 21:11:31 +0000 (21:11 +0000)]
Fix URL in doxygen comment.
Previous link was broken.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1599799 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 3 Jun 2014 20:43:41 +0000 (20:43 +0000)]
Fix r1593665 where I miss read the code and what is performed in "header_inout_cmd()" where arguments are "shuffled" according to the "action" to be performed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1599794 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 3 Jun 2014 16:02:44 +0000 (16:02 +0000)]
Break out common code to be share-able
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1599641 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 3 Jun 2014 15:49:25 +0000 (15:49 +0000)]
fold in performance hack from eventopt
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1599625 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 3 Jun 2014 15:46:48 +0000 (15:46 +0000)]
Update eventopt w/ bucket listeners
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1599624 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 3 Jun 2014 15:25:59 +0000 (15:25 +0000)]
Now allow MPMs to call ap_log_common()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1599603 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 3 Jun 2014 15:22:37 +0000 (15:22 +0000)]
We really need some place where we can place a whole
bunch of data/info-that-should-be-logged-by-all-mpms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1599601 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 3 Jun 2014 15:06:45 +0000 (15:06 +0000)]
Remove backported changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1599596 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 3 Jun 2014 14:51:44 +0000 (14:51 +0000)]
Don't try to assume the value of SO_REUSEPORT...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1599593 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 3 Jun 2014 13:17:58 +0000 (13:17 +0000)]
add GlobalLog directive to allow a diagnostic log to be inherited
by all virtual hosts, even if they define their own logs.
Submitted By: Edward Lu <Chaosed0 gmail.com>
Committed by: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1599535 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 3 Jun 2014 13:07:29 +0000 (13:07 +0000)]
Optimize w/ duplicated listeners and use of SO_REUSEPORT
where available.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1599531 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 3 Jun 2014 11:47:11 +0000 (11:47 +0000)]
mod_proxy_http: avoid (unlikely) access to freed memory.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1599486 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 2 Jun 2014 21:34:25 +0000 (21:34 +0000)]
ignore
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1599367 13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sun, 1 Jun 2014 20:05:44 +0000 (20:05 +0000)]
mod_proxy_html: support automatic doctype detection.
PR 56285
Patch by Micha Lenk, adapted by niq
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1599027 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 1 Jun 2014 17:35:15 +0000 (17:35 +0000)]
Syntax highlight
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1599015 13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sun, 1 Jun 2014 17:33:16 +0000 (17:33 +0000)]
mod_proxy_html: skip documents < 4 bytes
PR 56286
Micha Lenk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1599012 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 1 Jun 2014 10:01:03 +0000 (10:01 +0000)]
SetHandler only has one parameter + reflow a sentence to synch with 2.4.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1598962 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 1 Jun 2014 06:54:15 +0000 (06:54 +0000)]
Fix computation of the size of 'struct sockaddr_un' when passed to 'connect()'.
Use the same logic as the one in ' in 'proxy_util.c'.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1598946 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Fri, 30 May 2014 11:41:23 +0000 (11:41 +0000)]
update Japanese translation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1598561 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Thu, 29 May 2014 18:40:54 +0000 (18:40 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1598361 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Thu, 29 May 2014 18:39:48 +0000 (18:39 +0000)]
XML Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1598359 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Thu, 29 May 2014 14:07:26 +0000 (14:07 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1598295 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Thu, 29 May 2014 14:05:39 +0000 (14:05 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1598293 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Thu, 29 May 2014 12:33:11 +0000 (12:33 +0000)]
copy AllowCONNECT Japanese translation from
mod_proxy.xml.ja and some updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1598276 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 29 May 2014 06:20:36 +0000 (06:20 +0000)]
Doxygen fix + alignment + typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1598207 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 28 May 2014 20:51:16 +0000 (20:51 +0000)]
Fix typo spotted on online doc by Louise Hope.
#comment_2558
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1598137 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 28 May 2014 19:14:28 +0000 (19:14 +0000)]
Create DH parameters from OpenSSL at module init, avoiding (very
minor) race and leaks:
* modules/ssl/ssl_engine_init.c (make_dh_params): Moved/rejigged
variant of make_get_dh() macro.
(init_dh_params, free_dh_params): New functions.
(modssl_get_dh_params): Split out from ssl_callback_TmpDH.
(ssl_init_Module, ssl_init_ModuleKill): Use new init_/free_.
* modules/ssl/ssl_engine_kernel.c: Moved out DH parameter handling.
(ssl_callback_TmpDH): Use modssl_get_dh_params.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1598107 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 28 May 2014 18:02:50 +0000 (18:02 +0000)]
xform
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1598090 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 28 May 2014 18:01:38 +0000 (18:01 +0000)]
fix typo -- comment 2561
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1598088 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 26 May 2014 20:25:01 +0000 (20:25 +0000)]
Rename module name in doxygen + partly revert r832442 which skipped doxygen doc generation for 'mod_watchdog.h'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1597642 13f79535 -47bb-0310-9956-
ffa450edef68
projects / apache / log