]>
granicus.if.org Git - apache/log
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
Christophe Jaillet [Mon, 26 May 2014 20:09:09 +0000 (20:09 +0000)]
Doxygen fix + reorg to match how other header files are built
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1597639 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Mon, 26 May 2014 09:15:44 +0000 (09:15 +0000)]
mod_cache: try to use the key of a possible open but stale cache entry
if we have one in cache_try_lock(). PR 50317
Submitted by: Ruediger Pluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1597533 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 24 May 2014 20:55:52 +0000 (20:55 +0000)]
* Give ap_proxy_post_request as chance to act correctly on the status code
by setting r->status temporarily to access_status. r->status might be
different than access_status e.g. r->status could be HTTP_OK if e.g. we
override the error page on the proxy or if the error was not generated
by the backend itself but by the proxy e.g. a bad gateway.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1597352 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 24 May 2014 20:28:56 +0000 (20:28 +0000)]
* Hand out the same DH structure in ssl_callback_TmpDH set by
SSL_CTX_set_tmp_dh_callback though once generated as we leak
memory otherwise and freeing the structure up after use would be
hard to track and in fact is not needed at all as it is safe to
use the same parameters over and over again security wise (in
contrast to the keys itself) and code safe as the returned structure
is duplicated by OpenSSL anyway. Hence no modification happens
to our copy.
Observed by: rjung
Reviewed by: kbrand
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1597349 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Fri, 23 May 2014 21:27:26 +0000 (21:27 +0000)]
update transformations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1597190 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Fri, 23 May 2014 21:15:47 +0000 (21:15 +0000)]
update Japanese translation for r1597021.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1597183 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 23 May 2014 21:12:16 +0000 (21:12 +0000)]
Save a few bytes of memory. This can be done in temp_pool.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1597182 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 23 May 2014 09:32:03 +0000 (09:32 +0000)]
Rebuil.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1597043 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 23 May 2014 09:30:30 +0000 (09:30 +0000)]
HTML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1597042 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 23 May 2014 09:26:17 +0000 (09:26 +0000)]
XML Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1597041 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 23 May 2014 09:06:34 +0000 (09:06 +0000)]
XML Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1597036 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Fri, 23 May 2014 07:54:13 +0000 (07:54 +0000)]
follow up r1387612:
All current windows have functionality of windows service,
so remove the redundant phrase.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1597021 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Fri, 23 May 2014 02:23:44 +0000 (02:23 +0000)]
merge r1537109 from 2.4(!):
Doc : reordering a section for better understanding
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1597004 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 22 May 2014 20:29:29 +0000 (20:29 +0000)]
the fixup hook should log (what is expected to be) local
path just like the translate name hook, for a small hint
when debugging 400 errors set just below
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1596963 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 22 May 2014 20:22:18 +0000 (20:22 +0000)]
Fix typo spotted on online doc by Gerard H. Pille.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1596962 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Thu, 22 May 2014 17:46:36 +0000 (17:46 +0000)]
update transformations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1596926 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Thu, 22 May 2014 17:41:03 +0000 (17:41 +0000)]
update Japanese translations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1596925 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Thu, 22 May 2014 16:41:12 +0000 (16:41 +0000)]
update Japanese translations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1596917 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Thu, 22 May 2014 15:59:26 +0000 (15:59 +0000)]
update Japanese translations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1596906 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Thu, 22 May 2014 10:56:27 +0000 (10:56 +0000)]
I don't know why, but the revision refernce is wrong. fixed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1596807 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Wed, 21 May 2014 11:39:21 +0000 (11:39 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1596543 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Wed, 21 May 2014 11:37:02 +0000 (11:37 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1596542 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 21 May 2014 02:45:37 +0000 (02:45 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1596444 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 21 May 2014 02:20:27 +0000 (02:20 +0000)]
Add version number in <title> as proposed by Louise Hope in online doc.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1596441 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 20 May 2014 18:18:09 +0000 (18:18 +0000)]
Fix typo spotted on online doc by Markie.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1596347 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 20 May 2014 04:02:49 +0000 (04:02 +0000)]
Fix duplicate APLOGNO
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1596108 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Mon, 19 May 2014 14:26:10 +0000 (14:26 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1595912 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 19 May 2014 12:24:43 +0000 (12:24 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1595862 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 19 May 2014 12:24:06 +0000 (12:24 +0000)]
Follow-up to r1588987:
Fix doc and code confusion about the trust/distrust flag; 1 is
distrust, 0 or NULL/- is trust.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1595861 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 19 May 2014 11:09:10 +0000 (11:09 +0000)]
Second try adding mod_dumpio.html.fr.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1595828 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 19 May 2014 09:58:22 +0000 (09:58 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1595812 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 19 May 2014 09:47:16 +0000 (09:47 +0000)]
Readding french translated mod_dumpio.xml.fr file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1595805 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 19 May 2014 09:40:44 +0000 (09:40 +0000)]
Deleting htmlonly mod_dumpio.html.fr file
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1595799 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 19 May 2014 09:37:00 +0000 (09:37 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1595798 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 19 May 2014 09:33:23 +0000 (09:33 +0000)]
mod_dumpio.html.fr is not registered, so rebuild from zero
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1595795 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 19 May 2014 09:25:53 +0000 (09:25 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1595789 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 19 May 2014 09:24:14 +0000 (09:24 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1595788 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 19 May 2014 09:15:45 +0000 (09:15 +0000)]
New french translated html file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1595785 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 19 May 2014 09:08:39 +0000 (09:08 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1595783 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 19 May 2014 08:57:21 +0000 (08:57 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1595781 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 19 May 2014 08:47:43 +0000 (08:47 +0000)]
New french translated xml file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1595780 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sun, 18 May 2014 21:12:01 +0000 (21:12 +0000)]
fix transformation (dumpio.fr is not there (yet?))
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1595686 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 18 May 2014 14:16:59 +0000 (14:16 +0000)]
HTML build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1595621 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 18 May 2014 14:15:20 +0000 (14:15 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1595620 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 18 May 2014 12:34:19 +0000 (12:34 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1595614 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 18 May 2014 12:33:38 +0000 (12:33 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1595613 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 18 May 2014 12:26:44 +0000 (12:26 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1595611 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 18 May 2014 12:23:34 +0000 (12:23 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1595609 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 18 May 2014 08:38:24 +0000 (08:38 +0000)]
Fix typo as spotted in a comment in online doc by JPKole
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1595575 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 17 May 2014 14:09:32 +0000 (14:09 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1595487 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 17 May 2014 14:05:35 +0000 (14:05 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1595484 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 17 May 2014 06:01:35 +0000 (06:01 +0000)]
mod_socache_shmcb: Correct counting of expirations for status display.
Expirations happening during retrieval were not counted.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1595426 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 16 May 2014 21:25:10 +0000 (21:25 +0000)]
Add missing variables:
Introduced in r1132494
CONTEXT_PREFIX
CONTEXT_DOCUMENT_ROOT
and since the beginning of util_expr_eval.c for
HTTP_COOKIE
Description still missing.
+ synch layout with 2.4
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1595353 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 16 May 2014 19:37:07 +0000 (19:37 +0000)]
Tweak a AP_DEBUG_ASSERT condition.
Valid index to use 'req_header_var_names' are 0...6
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1595321 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 16 May 2014 18:54:19 +0000 (18:54 +0000)]
* Correctly escape user provided data.
PR: 56532
Submitted by: Maksymilian <max cert.cx>
Reviewed by: rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1595305 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 15 May 2014 20:19:10 +0000 (20:19 +0000)]
Ensure that min/max valid timestamps (milliseconds since the epoch)
make sense: no negative numbers, and require an input of "-" instead
of "0" to indicate that the timestamp isn't being provided.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1595034 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 14 May 2014 17:34:05 +0000 (17:34 +0000)]
mod_cache: follow up to r1594643.
Avoid table lookup if not necessary (fast path first).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1594648 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 14 May 2014 17:11:49 +0000 (17:11 +0000)]
mod_cache: follow up to r1591328.
Define the cache_merge_headers_out() function to merge r->err_headers_out into
r->headers_out and add the ones from r->content_type/encoding if available.
Use it in ap_cache_cacheable_headers_out() where the same is done and in
cache_save_filter() where this has to be done before updating the entry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1594643 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 14 May 2014 15:54:38 +0000 (15:54 +0000)]
mod_proxy_wstunnel: Fix the use of SSL connections with the "wss:" scheme.
PR55320.
Submitted by: Alex Liu <alex.leo.ca gmail.com>
Committed by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1594625 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Wed, 14 May 2014 12:33:57 +0000 (12:33 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1594560 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 14 May 2014 10:51:25 +0000 (10:51 +0000)]
Remove entry for r1583175 and r1593745, now in 2.4.x branch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1594540 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Tue, 13 May 2014 17:50:39 +0000 (17:50 +0000)]
Fix some comment typos
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1594301 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 13 May 2014 12:18:54 +0000 (12:18 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1594210 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 12 May 2014 21:01:36 +0000 (21:01 +0000)]
Based on report from Ken Zalewski, on online doc.
Add missing Server-Variables useable in RewriteCond directive.
Introduced in r1132494
CONTEXT_PREFIX
CONTEXT_DOCUMENT_ROOT
Introduced in r737973
IPV6
Missing for ages!
SCRIPT_GROUP
SCRIPT_USER
I have added where I found it logical, feel free to adjust.
I have also reordered this table to ease reading.
Finally, I have beautified some tables at the end.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1594094 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 11 May 2014 20:52:32 +0000 (20:52 +0000)]
PR56333: Add an API to resume a connection that a handler has previously suspended.
Submitted by: Artem <artemciy gmail.com>, Edward Lu <Chaosed0 gmail.com>
Committed by: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1593860 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 11 May 2014 20:41:45 +0000 (20:41 +0000)]
Extend the socket callbacks in event to allow a timeout on the I/O callback.
When a socket callback has a timeout, an associated timer event is used to
remove the sockets from the pollset and call a timeout function.
* This includes a noteworthy change to the main event loop. Previously,
we would call epoll, then process the timer events, then iterate through the
poll results. After this patch, the timer events are processed before the poll()
a _non-queued_ action can change the pollset conents (a users timed callback
function conversely could easily sit in a queue while the main thread continues
down into epoll)
* timer events can now have sockets associated with them, those sockets are
removed from the pollset when the timer event fires w/o a queue to the worker.
* timer events now have a canceled flag that can be toggled without locking
the timer list.
* Drop the severity of some wstunnel messages from DEBUG to TRACE1
* Lift the restriction on using asynchronous websockets connections but having
an idle timeout
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1593857 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 10 May 2014 23:43:48 +0000 (23:43 +0000)]
stop setting context info for AliasMatch. These concepts do not really map
well/reliably to AliasMatch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1593745 13f79535 -47bb-0310-9956-
ffa450edef68