headers
takashi | 1 Jan 2012 20:44
Picon
Favicon

svn commit: r1226295 - /httpd/httpd/branches/2.2.x/docs/manual/style/lang/ja.xml

Author: takashi
Date: Sun Jan  1 19:44:34 2012
New Revision: 1226295

URL: http://svn.apache.org/viewvc?rev=1226295&view=rev
Log:
sync.
English Revision: 1044705

Submitted by: KIKUCHI Tokio <tokio.kikuchi gmail.com>
Reviewed by: takashi

Modified:
    httpd/httpd/branches/2.2.x/docs/manual/style/lang/ja.xml

Modified: httpd/httpd/branches/2.2.x/docs/manual/style/lang/ja.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/style/lang/ja.xml?rev=1226295&r1=1226294&r2=1226295&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/style/lang/ja.xml [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/style/lang/ja.xml [utf-8] Sun Jan  1 19:44:34 2012
 <at>  <at>  -1,6 +1,6  <at>  <at> 
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE language SYSTEM "../lang.dtd">
-<!-- English revision: 106753 -->
+<!-- English revision: 1044705 -->

 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
 <at>  <at>  -128,16 +128,18  <at>  <at> 
         <message id="sitemap">サイトマップ</message>
(Continue reading)

Permalink | Reply | 0 comments |
headers
takashi | 2 Jan 2012 02:08
Picon
Favicon

svn commit: r1226330 - in /httpd/httpd/branches/2.2.x: ./ docs/ docs/man/httxt2dbm.1 docs/manual/programs/httxt2dbm.xml

Author: takashi
Date: Mon Jan  2 01:08:45 2012
New Revision: 1226330

URL: http://svn.apache.org/viewvc?rev=1226330&view=rev
Log:
Merge r1222335 from trunk:

Build the man page for httxt2dbm.

Added:
    httpd/httpd/branches/2.2.x/docs/man/httxt2dbm.1
      - copied unchanged from r1222335, httpd/httpd/trunk/docs/man/httxt2dbm.1
Modified:
    httpd/httpd/branches/2.2.x/   (props changed)
    httpd/httpd/branches/2.2.x/docs/   (props changed)
    httpd/httpd/branches/2.2.x/docs/manual/programs/httxt2dbm.xml

Propchange: httpd/httpd/branches/2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan  2 01:08:45 2012
 <at>  <at>  -1 +1  <at>  <at> 
-/httpd/httpd/trunk:395552,417988,451572,583817,583830,611483,630858,639005,639010,647395,657354,657459,660461,660566,664330,678761,680082,681190,682369,683626,685112,686805,686809,687099,687754,693120,693392,693727-693728,696006,697093,706318,707163,708902,711421,719357,720250,729316-729317,729586,732414,732504,732832,733127,733134,733218-733219,734710,743589,755190,756671,756675,756678,756683,757741,761329,763394,764239,768535,769809,771587,771610,776325,777042,777091,778438-778439,778531,778942,780648,780655,780692,780697,780699,785457,785661,790587,803704,823536,823563,891282,932791,942209,953311,955966,992625,1026743,1031551,1058192,1070096,1082196,1223048
+/httpd/httpd/trunk:395552,417988,451572,583817,583830,611483,630858,639005,639010,647395,657354,657459,660461,660566,664330,678761,680082,681190,682369,683626,685112,686805,686809,687099,687754,693120,693392,693727-693728,696006,697093,706318,707163,708902,711421,719357,720250,729316-729317,729586,732414,732504,732832,733127,733134,733218-733219,734710,743589,755190,756671,756675,756678,756683,757741,761329,763394,764239,768535,769809,771587,771610,776325,777042,777091,778438-778439,778531,778942,780648,780655,780692,780697,780699,785457,785661,790587,803704,823536,823563,891282,932791,942209,953311,955966,992625,1026743,1031551,1058192,1070096,1082196,1222335,1223048

Propchange: httpd/httpd/branches/2.2.x/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan  2 01:08:45 2012
(Continue reading)

Permalink | Reply | 0 comments |
headers
sf | 2 Jan 2012 05:17
Picon
Favicon

svn commit: r1226339 - /httpd/httpd/trunk/include/ap_slotmem.h

Author: sf
Date: Mon Jan  2 04:17:46 2012
New Revision: 1226339

URL: http://svn.apache.org/viewvc?rev=1226339&view=rev
Log:
Avoid using C++ reserved word 'new' in arg name in header
Doc tweaks

Modified:
    httpd/httpd/trunk/include/ap_slotmem.h

Modified: httpd/httpd/trunk/include/ap_slotmem.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_slotmem.h?rev=1226339&r1=1226338&r2=1226339&view=diff
==============================================================================
--- httpd/httpd/trunk/include/ap_slotmem.h (original)
+++ httpd/httpd/trunk/include/ap_slotmem.h Mon Jan  2 04:17:46 2012
 <at>  <at>  -70,7 +70,7  <at>  <at>  typedef unsigned int ap_slotmem_type_t;
 typedef struct ap_slotmem_instance_t ap_slotmem_instance_t;

 /**
- * callback function used for slotmem.
+ * callback function used for slotmem doall.
  *  <at> param mem is the memory associated with a worker.
  *  <at> param data is what is passed to slotmem.
  *  <at> param pool is pool used
 <at>  <at>  -95,24 +95,26  <at>  <at>  struct ap_slotmem_provider_t {
     /**
      * create a new slotmem with each item size is item_size.
      * This would create shared memory, basically.
(Continue reading)

Permalink | Reply | 0 comments |
headers
sf | 2 Jan 2012 05:20
Picon
Favicon

svn commit: r1226340 - /httpd/httpd/branches/2.4.x/include/ap_slotmem.h

Author: sf
Date: Mon Jan  2 04:20:47 2012
New Revision: 1226340

URL: http://svn.apache.org/viewvc?rev=1226340&view=rev
Log:
Merge r1226339:
Avoid using C++ reserved word 'new' in arg name in header
Doc tweaks

Modified:
    httpd/httpd/branches/2.4.x/include/ap_slotmem.h

Modified: httpd/httpd/branches/2.4.x/include/ap_slotmem.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/include/ap_slotmem.h?rev=1226340&r1=1226339&r2=1226340&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/include/ap_slotmem.h (original)
+++ httpd/httpd/branches/2.4.x/include/ap_slotmem.h Mon Jan  2 04:20:47 2012
 <at>  <at>  -70,7 +70,7  <at>  <at>  typedef unsigned int ap_slotmem_type_t;
 typedef struct ap_slotmem_instance_t ap_slotmem_instance_t;

 /**
- * callback function used for slotmem.
+ * callback function used for slotmem doall.
  *  <at> param mem is the memory associated with a worker.
  *  <at> param data is what is passed to slotmem.
  *  <at> param pool is pool used
 <at>  <at>  -95,24 +95,26  <at>  <at>  struct ap_slotmem_provider_t {
     /**
      * create a new slotmem with each item size is item_size.
(Continue reading)

Permalink | Reply | 0 comments |
headers
sf | 2 Jan 2012 10:00
Picon
Favicon

svn commit: r1226375 - in /httpd/httpd/trunk: docs/log-message-tags/next-number modules/slotmem/mod_slotmem_shm.c

Author: sf
Date: Mon Jan  2 09:00:55 2012
New Revision: 1226375

URL: http://svn.apache.org/viewvc?rev=1226375&view=rev
Log:
Add a bit of debug logging

Modified:
    httpd/httpd/trunk/docs/log-message-tags/next-number
    httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c

Modified: httpd/httpd/trunk/docs/log-message-tags/next-number
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/log-message-tags/next-number?rev=1226375&r1=1226374&r2=1226375&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/log-message-tags/next-number (original)
+++ httpd/httpd/trunk/docs/log-message-tags/next-number Mon Jan  2 09:00:55 2012
 <at>  <at>  -1 +1  <at>  <at> 
-2293
+2295

Modified: httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c?rev=1226375&r1=1226374&r2=1226375&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c (original)
+++ httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c Mon Jan  2 09:00:55 2012
 <at>  <at>  -24,6 +24,7  <at>  <at> 
 #include  "ap_slotmem.h"

 #include "httpd.h"
(Continue reading)

Permalink | Reply | 0 comments |
headers
sf | 2 Jan 2012 10:02
Picon
Favicon

svn commit: r1226376 - in /httpd/httpd/branches/2.4.x: ./ modules/slotmem/mod_slotmem_shm.c

Author: sf
Date: Mon Jan  2 09:02:31 2012
New Revision: 1226376

URL: http://svn.apache.org/viewvc?rev=1226376&view=rev
Log:
Merge r1226375:
Add a bit of debug logging

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_shm.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan  2 09:02:31 2012
 <at>  <at>  -1,3 +1,3  <at>  <at> 
 /httpd/httpd/branches/revert-ap-ldap:1150158-1150173
 /httpd/httpd/branches/wombat-integration:723609-723841
-/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202236,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1206850,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210080,1210124,1210130,1210219,1210221,1210252,1210284,1210378,1210725,1210892,1210951,1210954,1211528,1211663,1211680,1212883,1213338,1213567,1214003,1214005,1214015,1220462,1220467,1220493,1220524,1220570,1220768,1220794,1220826,1220846,1221292,1222335,1222370,1222473,1222915,1222917,1222921,1223048,1225060,1225197-1225198,1225380,1225476,1225478,1225791,1225795-1225796
+/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202236,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1206850,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210080,1210124,1210130,1210219,1210221,1210252,1210284,1210378,1210725,1210892,1210951,1210954,1211528,1211663,1211680,1212883,1213338,1213567,1214003,1214005,1214015,1220462,1220467,1220493,1220524,1220570,1220768,1220794,1220826,1220846,1221292,1222335,1222370,1222473,1222915,1222917,1222921,1223048,1225060,1225197-1225198,1225380,1225476,1225478,1225791,1225795-1225796,1226339,1226375

Modified: httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_shm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_shm.c?rev=1226376&r1=1226375&r2=1226376&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_shm.c (original)
+++ httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_shm.c Mon Jan  2 09:02:31 2012
 <at>  <at>  -24,6 +24,7  <at>  <at> 
 #include  "ap_slotmem.h"
(Continue reading)

Permalink | Reply | 0 comments |
headers
covener | 2 Jan 2012 18:18
Picon
Favicon
Gravatar

svn commit: r1226477 - in /httpd/httpd/trunk/docs/manual: misc/security_tips.html.en misc/security_tips.xml mod/mod_access_compat.html.en mod/mod_access_compat.xml sections.html.en sections.xml

Author: covener
Date: Mon Jan  2 17:18:39 2012
New Revision: 1226477

URL: http://svn.apache.org/viewvc?rev=1226477&view=rev
Log:
add/enhance some hints about configuration section merging (or lack of it in
the case of mod_access_compat)
PR52406

Modified:
    httpd/httpd/trunk/docs/manual/misc/security_tips.html.en
    httpd/httpd/trunk/docs/manual/misc/security_tips.xml
    httpd/httpd/trunk/docs/manual/mod/mod_access_compat.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_access_compat.xml
    httpd/httpd/trunk/docs/manual/sections.html.en
    httpd/httpd/trunk/docs/manual/sections.xml

Modified: httpd/httpd/trunk/docs/manual/misc/security_tips.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/misc/security_tips.html.en?rev=1226477&r1=1226476&r2=1226477&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/misc/security_tips.html.en (original)
+++ httpd/httpd/trunk/docs/manual/misc/security_tips.html.en Mon Jan  2 17:18:39 2012
 <at>  <at>  -39,6 +39,7  <at>  <at> 
 <li><img alt="" src="../images/down.gif" /> <a href="#systemsettings">Protecting System Settings</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#protectserverfiles">Protect Server Files by Default</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#watchyourlogs">Watching Your Logs</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#merging">Merging of configuration sections</a></li>
 </ul></div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
(Continue reading)

Permalink | Reply | 1 comment |
headers
covener | 2 Jan 2012 18:20
Picon
Favicon
Gravatar

svn commit: r1226481 - in /httpd/httpd/branches/2.4.x/docs/manual: misc/security_tips.html.en misc/security_tips.xml mod/mod_access_compat.html.en mod/mod_access_compat.xml sections.html.en sections.xml

Author: covener
Date: Mon Jan  2 17:20:11 2012
New Revision: 1226481

URL: http://svn.apache.org/viewvc?rev=1226481&view=rev
Log:
Merge r1226477 from trunk:

add/enhance some hints about configuration section merging (or lack of it in
the case of mod_access_compat)
PR52406

Modified:
    httpd/httpd/branches/2.4.x/docs/manual/misc/security_tips.html.en
    httpd/httpd/branches/2.4.x/docs/manual/misc/security_tips.xml
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_access_compat.html.en
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_access_compat.xml
    httpd/httpd/branches/2.4.x/docs/manual/sections.html.en
    httpd/httpd/branches/2.4.x/docs/manual/sections.xml

Modified: httpd/httpd/branches/2.4.x/docs/manual/misc/security_tips.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/misc/security_tips.html.en?rev=1226481&r1=1226480&r2=1226481&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/misc/security_tips.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/misc/security_tips.html.en Mon Jan  2 17:20:11 2012
 <at>  <at>  -39,6 +39,7  <at>  <at> 
 <li><img alt="" src="../images/down.gif" /> <a href="#systemsettings">Protecting System Settings</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#protectserverfiles">Protect Server Files by Default</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#watchyourlogs">Watching Your Logs</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#merging">Merging of configuration sections</a></li>
(Continue reading)

Permalink | Reply | 0 comments |
headers
sf | 2 Jan 2012 18:33
Picon
Favicon

svn commit: r1226487 - in /httpd/mod_mbox/trunk/module-2.0: mod_mbox.c mod_mbox.h mod_mbox_out.c

Author: sf
Date: Mon Jan  2 17:33:26 2012
New Revision: 1226487

URL: http://svn.apache.org/viewvc?rev=1226487&view=rev
Log:
cache get_base_* results in request config

add get_base_name(), fix some warnings

Modified:
    httpd/mod_mbox/trunk/module-2.0/mod_mbox.c
    httpd/mod_mbox/trunk/module-2.0/mod_mbox.h
    httpd/mod_mbox/trunk/module-2.0/mod_mbox_out.c

Modified: httpd/mod_mbox/trunk/module-2.0/mod_mbox.c
URL: http://svn.apache.org/viewvc/httpd/mod_mbox/trunk/module-2.0/mod_mbox.c?rev=1226487&r1=1226486&r2=1226487&view=diff
==============================================================================
--- httpd/mod_mbox/trunk/module-2.0/mod_mbox.c (original)
+++ httpd/mod_mbox/trunk/module-2.0/mod_mbox.c Mon Jan  2 17:33:26 2012
 <at>  <at>  -44,6 +44,12  <at>  <at> 
 APLOG_USE_MODULE(mbox);
 #endif

+typedef struct {
+    const char *base_uri;
+    const char *base_path;
+    const char *base_name;
+} mbox_req_cfg_t;
+
(Continue reading)

Permalink | Reply | 0 comments |
headers
sf | 2 Jan 2012 18:39
Picon
Favicon

svn commit: r1226491 - /httpd/mod_mbox/trunk/module-2.0/mod_mbox_out.c

Author: sf
Date: Mon Jan  2 17:39:17 2012
New Revision: 1226491

URL: http://svn.apache.org/viewvc?rev=1226491&view=rev
Log:
factor common code into function

display short list name in h1 heading/title

always set charset=utf-8 in headers

Modified:
    httpd/mod_mbox/trunk/module-2.0/mod_mbox_out.c

Modified: httpd/mod_mbox/trunk/module-2.0/mod_mbox_out.c
URL: http://svn.apache.org/viewvc/httpd/mod_mbox/trunk/module-2.0/mod_mbox_out.c?rev=1226491&r1=1226490&r2=1226491&view=diff
==============================================================================
--- httpd/mod_mbox/trunk/module-2.0/mod_mbox_out.c (original)
+++ httpd/mod_mbox/trunk/module-2.0/mod_mbox_out.c Mon Jan  2 17:39:17 2012
 <at>  <at>  -708,6 +708,48  <at>  <at>  static void mbox_static_msglist_nav(requ
     ap_rputs("</th></tr>\n", r);
 }

+/* Send page header */
+static void send_page_header(request_rec *r, const char *title,
+                             const char *h1, int add_script)
+{
+    mbox_dir_cfg_t *conf = ap_get_module_config(r->per_dir_config,
+                                                &mbox_module);
(Continue reading)

Permalink | Reply | 0 comments |

Gmane