]> granicus.if.org Git - apache/log
apache
10 years agoFix computation of the size of 'struct sockaddr_un' when passed to 'connect()'.
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

10 years agoupdate Japanese translation
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

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

10 years agoXML Update.
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

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

10 years agoXML update.
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

10 years agocopy AllowCONNECT Japanese translation from
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

10 years agoDoxygen fix + alignment + typo
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

10 years agoFix typo spotted on online doc by Louise Hope.
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

10 years agoCreate DH parameters from OpenSSL at module init, avoiding (very
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

10 years agoxform
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

10 years agofix typo -- comment 2561
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

10 years agoRename module name in doxygen + partly revert r832442 which skipped doxygen doc gener...
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

10 years agoDoxygen fix + reorg to match how other header files are built
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

10 years agomod_cache: try to use the key of a possible open but stale cache entry
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

10 years ago* Give ap_proxy_post_request as chance to act correctly on the status code
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

10 years ago* Hand out the same DH structure in ssl_callback_TmpDH set by
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

10 years agoupdate transformations
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

10 years agoupdate Japanese translation for r1597021.
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

10 years agoSave a few bytes of memory. This can be done in temp_pool.
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

10 years agoRebuil.
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

10 years agoHTML updates.
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

10 years agoXML Update.
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

10 years agoXML Updates.
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

10 years agofollow up r1387612:
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

10 years agomerge r1537109 from 2.4(!):
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

10 years agothe fixup hook should log (what is expected to be) local
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

10 years agoFix typo spotted on online doc by Gerard H. Pille.
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

10 years agoupdate transformations
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

10 years agoupdate Japanese translations
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

10 years agoupdate Japanese translations
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

10 years agoupdate Japanese translations
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

10 years agoI don't know why, but the revision refernce is wrong. fixed.
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

10 years agoUpdates.
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

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

10 years agorebuild
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

10 years agoAdd version number in <title> as proposed by Louise Hope in online doc.
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

10 years agoFix typo spotted on online doc by Markie.
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

10 years agoFix duplicate APLOGNO
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

10 years agoupdate transformation
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

10 years agoxforms
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

10 years agoFollow-up to r1588987:
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

10 years agoSecond try adding mod_dumpio.html.fr.
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

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

10 years agoReadding french translated mod_dumpio.xml.fr file.
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

10 years agoDeleting htmlonly mod_dumpio.html.fr file
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

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

10 years agomod_dumpio.html.fr is not registered, so rebuild from zero
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

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

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

10 years agoNew french translated html file.
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

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

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

10 years agoNew french translated xml file.
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

10 years agofix transformation (dumpio.fr is not there (yet?))
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

10 years agoHTML build.
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

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

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

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

10 years agoUpdates.
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

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

10 years agoFix typo as spotted in a comment in online doc by JPKole
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

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

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

10 years agomod_socache_shmcb: Correct counting of expirations for status display.
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

10 years agoAdd missing variables:
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

10 years agoTweak a AP_DEBUG_ASSERT condition.
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

10 years ago* Correctly escape user provided data.
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

10 years agoEnsure that min/max valid timestamps (milliseconds since the epoch)
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

10 years agomod_cache: follow up to r1594643.
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

10 years agomod_cache: follow up to r1591328.
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

10 years agomod_proxy_wstunnel: Fix the use of SSL connections with the "wss:" scheme.
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

10 years agoUpdates.
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

10 years agoRemove entry for r1583175 and r1593745, now in 2.4.x branch
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

10 years agoFix some comment typos
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

10 years agoUpdates.
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

10 years agoBased on report from Ken Zalewski, on online doc.
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

10 years agoPR56333: Add an API to resume a connection that a handler has previously suspended.
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

10 years agoExtend the socket callbacks in event to allow a timeout on the I/O callback.
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

10 years agostop setting context info for AliasMatch. These concepts do not really map
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

10 years agoMinor visual improvement.
Christophe Jaillet [Sat, 10 May 2014 11:28:10 +0000 (11:28 +0000)]
Minor visual improvement.
Remove useless link.

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

10 years ago- Add missing links
Christophe Jaillet [Sat, 10 May 2014 05:49:43 +0000 (05:49 +0000)]
- Add missing links
- Fix extra ] spotted in online doc by emigas.
- Remove another ] introduced in Hearder syntax in r1588244
- s/variable/varname/ to match the text below it.
- Turn the syntax of both Header and RequestHeader to be:
   header [value [replacement [early|env=[!]variable|expr=expression]]]
in order to match the code.
This removes the ambiguity of expr=<something> which can now be used in 2 different places in the syntax.
- Also remove the space in 'expr= value' in compatibility note, to help distinguish between the two

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

10 years agoremove some entries for backported improvements
Jeff Trawick [Wed, 7 May 2014 13:12:42 +0000 (13:12 +0000)]
remove some entries for backported improvements

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

10 years agomod_dav: Fix invalid Location header when a resource is created by passing an
Ben Reser [Tue, 6 May 2014 05:00:21 +0000 (05:00 +0000)]
mod_dav: Fix invalid Location header when a resource is created by passing an
absolute URI on the request line.

Using r->unparsed_uri is wrong since it might contain a scheme, hostname and
port.  See section 5.1.2 of RFC 2616, an absolute URI is allowed.  The
unparsed_uri field is absolutely unparsed.  The current code causes the
Location header to end up having the scheme, host and port included twice.

* modules/dav/main/mod_dav.c
  (dav_created): Call ap_escape_uri() on r->uri when caller doesn't provide a
    location.

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

10 years agofix Doxygen markup error
Jeff Trawick [Mon, 5 May 2014 21:13:12 +0000 (21:13 +0000)]
fix Doxygen markup error

Submitted by: jailletc36

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

10 years agoFollow-up to r1592529:
Jeff Trawick [Mon, 5 May 2014 19:26:33 +0000 (19:26 +0000)]
Follow-up to r1592529:

Define default port for "scgi" schemes (as chosen by
mod_proxy_scgi) in a common location.

Suggested by: jailletc36

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

10 years agomod_proxy_scgi: Support Unix sockets.
Jeff Trawick [Mon, 5 May 2014 14:02:48 +0000 (14:02 +0000)]
mod_proxy_scgi: Support Unix sockets.

ap_proxy_port_of_scheme(): Support default SCGI port (4000).

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

10 years agoClarify an existing requirement of the server_portstr parameter
Jeff Trawick [Mon, 5 May 2014 12:47:18 +0000 (12:47 +0000)]
Clarify an existing requirement of the server_portstr parameter
to ap_proxy_determine_connection(): it must be a buffer of at
least one byte in size.

(And don't bother with using strcpy in order to zap a string.)

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

10 years agoreformat only (get rid of unnecessary block scope)
Jeff Trawick [Mon, 5 May 2014 12:40:47 +0000 (12:40 +0000)]
reformat only (get rid of unnecessary block scope)

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

10 years agonow understood why users haven't reported the segfault (yet) when mod_proxy_fcgi
Jeff Trawick [Mon, 5 May 2014 12:13:15 +0000 (12:13 +0000)]
now understood why users haven't reported the segfault (yet) when mod_proxy_fcgi
can't connect to the application

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

10 years agorebuild
Jeff Trawick [Sat, 3 May 2014 13:44:05 +0000 (13:44 +0000)]
rebuild

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

10 years agoFill in various blurry areas reported on the certificate-transparency
Jeff Trawick [Sat, 3 May 2014 13:43:14 +0000 (13:43 +0000)]
Fill in various blurry areas reported on the certificate-transparency
forum.

Fix a minor formatting glitch with the attempt to show shell escaping
for a hash sign.

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

10 years agorebuild docs
Jeff Trawick [Sat, 3 May 2014 12:33:28 +0000 (12:33 +0000)]
rebuild docs

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

10 years agomod_proxy_fcgi: Fix occasional high CPU when handling request bodies.
Jeff Trawick [Fri, 2 May 2014 20:46:28 +0000 (20:46 +0000)]
mod_proxy_fcgi: Fix occasional high CPU when handling request bodies.

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

10 years agobetter diagnostics for failures during dispatch()
Jeff Trawick [Fri, 2 May 2014 20:33:57 +0000 (20:33 +0000)]
better diagnostics for failures during dispatch()

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

10 years agoNow in https://svn.apache.org/repos/asf/httpd/mod_spdy
Jim Jagielski [Thu, 1 May 2014 11:44:08 +0000 (11:44 +0000)]
Now in https://svn.apache.org/repos/asf/httpd/mod_spdy

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

10 years agofix LastChangedRevision
Takashi Sato [Thu, 1 May 2014 02:48:38 +0000 (02:48 +0000)]
fix LastChangedRevision

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

10 years agomod_proxy_fcgi: Support iobuffersize parameter.
Jeff Trawick [Wed, 30 Apr 2014 22:52:41 +0000 (22:52 +0000)]
mod_proxy_fcgi: Support iobuffersize parameter.

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

10 years agoAxe unnecessary memset() calls and allocating an extra
Jeff Trawick [Wed, 30 Apr 2014 20:21:03 +0000 (20:21 +0000)]
Axe unnecessary memset() calls and allocating an extra
byte in an I/O buffer for '\0', which hasn't been needed
since a strstr("\r\n\r\n") was removed in r371428.

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

10 years agomod_ssl: follow up to r1583191.
Yann Ylavic [Wed, 30 Apr 2014 17:15:07 +0000 (17:15 +0000)]
mod_ssl: follow up to r1583191.

Use type BOOL for modssl_ctx_t's field ocsp_use_request_nonce.
Suggested by: kbrand.

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