]>
granicus.if.org Git - apache/log
Lucien Gentis [Wed, 9 Jul 2014 11:51:10 +0000 (11:51 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1609114 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Wed, 9 Jul 2014 11:49:44 +0000 (11:49 +0000)]
XML Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1609113 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 9 Jul 2014 11:11:23 +0000 (11:11 +0000)]
Fix C99 (or later only) comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1609101 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 9 Jul 2014 03:47:31 +0000 (03:47 +0000)]
s/apr_pstrndup/apr_pstrmemdup/ to save a few cycles
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1608999 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 8 Jul 2014 13:54:09 +0000 (13:54 +0000)]
clarify a comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1608785 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 8 Jul 2014 13:18:20 +0000 (13:18 +0000)]
backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1608766 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Tue, 8 Jul 2014 12:21:56 +0000 (12:21 +0000)]
* server/listen.c: return -1 in find_systemd_socket on error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1608744 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 8 Jul 2014 11:16:59 +0000 (11:16 +0000)]
whitespace changes only
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1608721 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Tue, 8 Jul 2014 09:42:24 +0000 (09:42 +0000)]
* server/listen.c: detect systemd socket activation using sd_listen_fds(),
drop the support for "Listen systemd" and use standard Listen syntax instead.
This allows using the same configuration file with or without socket activation
and allows setting protocol when using socket activation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1608703 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Tue, 8 Jul 2014 09:03:02 +0000 (09:03 +0000)]
Follow up r1608686, pass process to alloc_systemd_listener.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1608694 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Tue, 8 Jul 2014 07:56:59 +0000 (07:56 +0000)]
* server/listen.c: duplicate sockets correctly when using systemd socket
activation, fix addrlen in getsockname() call.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1608686 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 6 Jul 2014 18:58:19 +0000 (18:58 +0000)]
The SNI callback already logs a debug message when the vhost
is found or no vhost matches. Log one when no name is provided
by the client.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1608284 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 6 Jul 2014 14:06:50 +0000 (14:06 +0000)]
Consolidate common code that got duplicated by 2.3.x authz refactoring.
Arrange for backend LDAP connections to be returned
to the pool by a fixup hook rather than staying locked
until the end of (a potentially slow) request.
Add a little more trace4 to the authnz_ldap side of LDAP connection obtain/release.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1608202 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 5 Jul 2014 12:59:36 +0000 (12:59 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1608010 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 5 Jul 2014 12:58:18 +0000 (12:58 +0000)]
XML Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1608008 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 5 Jul 2014 00:06:23 +0000 (00:06 +0000)]
xform
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1607961 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 5 Jul 2014 00:06:15 +0000 (00:06 +0000)]
make LDAPConnectionPoolTTL more conservative, use r->request_time rather than
end-of-request time, and only update it after a round-trip with the LDAP
server rather than every time we check back into the pool.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1607960 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 2 Jul 2014 12:51:20 +0000 (12:51 +0000)]
Follow-up to r1606368: HANDLE is PVOID which is void * (fix format string)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1607352 13f79535 -47bb-0310-9956-
ffa450edef68
Ben Reser [Mon, 30 Jun 2014 16:54:27 +0000 (16:54 +0000)]
mod_lua: Remove dead code left over from the old code cache.
The code that used this was commented out in r721594, then removed entirely in
r728497, and finally a commit was made intending to remove the last traces of
the code cache in r1200513, but this initialization lived on anyway.
* modules/lua/mod_lua.c
(create_server_config): Remove unused empty hash and rwlock for hash.
* modules/lua/mod_lua.h
(ap_lua_server_cfg): Remove unneeded hash and rwlock entries.
Found by: Bert Huijben <rhuijben{_at_}collab.net>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1606836 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 28 Jun 2014 15:01:11 +0000 (15:01 +0000)]
Follow up to r1527220/r1588852:
Implement better error checking/reporting around notification of abrupt parent
process termination.
It is likely that something bad is happening here based on these
user reports:
https://www.apachelounge.com/viewtopic.php?p=27848
http://mail-archives.apache.org/mod_mbox/httpd-users/201406.mbox/%3CCAC%2BRZnuwLD%2BJnoy2TYO8oeAWt6bFLMa%3DEhfDf9hS3cuuGUHXAw%40mail.gmail.com%3E
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1606368 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 28 Jun 2014 13:54:16 +0000 (13:54 +0000)]
Follow-up to r1593860:
Fix build breakage on non-syslog.h platforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1606358 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 28 Jun 2014 12:55:08 +0000 (12:55 +0000)]
APR_THREAD_FUNC decorator needed for 32-bit builds on Windows
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1606337 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 27 Jun 2014 08:09:57 +0000 (08:09 +0000)]
Update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1605984 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Fri, 27 Jun 2014 04:17:30 +0000 (04:17 +0000)]
Revert r1601943, r1602058, r1605307 (socket callback returning pollfds)
Revert r1605369 (wstunnel refactoring)
per discassion on dev@httpd.a.o thread Message-ID:
<CALK=YjN9HfThP_k_rF9iJPcUhcQk9sNOaDPxZNG+HcJNWS4ZAQ@mail.gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1605946 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 26 Jun 2014 16:28:29 +0000 (16:28 +0000)]
Update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1605843 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 26 Jun 2014 16:25:44 +0000 (16:25 +0000)]
- ignore <br> inside <dd> too, since ab.xml is using that,
though it's kind of wrong
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1605841 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 26 Jun 2014 15:54:34 +0000 (15:54 +0000)]
- note tweak to DH parameter sizes used in r1605827;
dropped the date reference here since it would no longer
be accurate.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1605829 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 26 Jun 2014 15:49:49 +0000 (15:49 +0000)]
* modules/ssl/ssl_engine_init.c: Make DH handling a bit more generic,
and adjust selection logic to prefer use of larger not smaller keys.
(init_dh_params, free_dh_params, modssl_get_dh_params): Use array of
structs to store and initialize DH parameters up to 8192-bit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1605827 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 26 Jun 2014 00:28:30 +0000 (00:28 +0000)]
remove some entries now present in the 2.4.x branch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1605641 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Wed, 25 Jun 2014 12:52:09 +0000 (12:52 +0000)]
Async mod_proxy_wstunnel:
Resume a client connection from SUSPENDED state to avoid the
connection remain suspended.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1605376 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Wed, 25 Jun 2014 12:24:03 +0000 (12:24 +0000)]
Refactor asynchronous mod_proxy_wstunnel using pollfd returned by MPM.
r1601943 and r1605307 made Event MPM return woken pollfd, so async
wstunnel doesn't need its own apr_pollset_poll.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1605369 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Wed, 25 Jun 2014 10:42:32 +0000 (10:42 +0000)]
event: minify local variables scope.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1605328 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Wed, 25 Jun 2014 09:42:41 +0000 (09:42 +0000)]
follow up r1601943:
Each apr_pollset_poll modified *out_pfd, so we need to copy it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1605307 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 24 Jun 2014 21:47:21 +0000 (21:47 +0000)]
Use ap_remove_input_filter_byhandle instead of duplicating the code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1605207 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 24 Jun 2014 12:34:52 +0000 (12:34 +0000)]
followup to r1604350, move the c->sbh assignment to immediately before the
socket is added to the timeout queue. Technically not needed because we hold
the lock on the timeout queue, but more consistent with other blocks that
leave the thread.
Submitted By: Edward Lu <Chaosed0 gmail com>
Committed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1605067 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 22 Jun 2014 18:14:31 +0000 (18:14 +0000)]
Follow up to r1604336: Comment out hooks whose only references are
now commented out, fixing a "-Wunused-function" warning
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1604631 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 22 Jun 2014 13:56:15 +0000 (13:56 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1604580 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 22 Jun 2014 13:55:03 +0000 (13:55 +0000)]
XML Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1604579 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 22 Jun 2014 13:53:44 +0000 (13:53 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1604577 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 22 Jun 2014 13:47:58 +0000 (13:47 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1604575 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 22 Jun 2014 05:36:19 +0000 (05:36 +0000)]
Add some compatibilty notes for some options of "support" applications
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1604535 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 21 Jun 2014 21:45:40 +0000 (21:45 +0000)]
event: Avoid timer's mutex two successive locks/unlocks with unrelated (and
optional) work in between.
Also saves declaration/usage of pointer 'ep' by reusing available 'te' instead,
and removes duplicated 'te' declaration in a local block.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1604466 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 21 Jun 2014 21:21:08 +0000 (21:21 +0000)]
Follow-up to r1601076:
Provide documentation for -m option.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1604461 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 21 Jun 2014 20:02:23 +0000 (20:02 +0000)]
event: follow up to r1604347.
Don't leak the timer event when it is cancelled.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1604451 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 21 Jun 2014 13:56:04 +0000 (13:56 +0000)]
doc xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1604384 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 21 Jun 2014 13:53:57 +0000 (13:53 +0000)]
Follow up r1573626 with some wordsmithing, a compatibility note,
and indentation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1604382 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 21 Jun 2014 13:15:06 +0000 (13:15 +0000)]
fix c++/c99 comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1604353 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 21 Jun 2014 13:05:07 +0000 (13:05 +0000)]
be more general
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1604351 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 21 Jun 2014 13:03:19 +0000 (13:03 +0000)]
missed a case in r1538490:
PR56639
Always NULL c->sbh before putting a connection back in a pollset or queue.
We can't NULL c->sbh at the bottom of process_socket() after putting a socket back on
the event_pollset or having it go into lingering close, because the listener or a worker
thread could A) continue on the connection or B) free and allocate the same conn_rec
pointer before we get to the bottom of process_socket().
Submitted By: Edward Lu
Committed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1604350 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Sat, 21 Jun 2014 12:58:35 +0000 (12:58 +0000)]
Do not call a timeout callback after the asociated socket
woke and the socket callback was called.
PR 56642
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1604347 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 21 Jun 2014 10:36:56 +0000 (10:36 +0000)]
Revert early|late argument for LuaHookCheckUserID as it does not work right now.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1604336 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 19 Jun 2014 15:09:15 +0000 (15:09 +0000)]
* modules/ssl/ssl_engine_init.c (make_dh_params): Remove redundant
temporary variable; no functional change.
(free_dh_params): Add comment.
Submitted by: rpluem, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1603915 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 19 Jun 2014 12:43:05 +0000 (12:43 +0000)]
Use unsigned bit flags (otherwise the non-zero value to be used is -1).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1603863 13f79535 -47bb-0310-9956-
ffa450edef68
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