Simplify. Added about PKWK_DISABLE_INLINE_IMAGE_FROM_URI

diff --git a/UPDATING.txt b/UPDATING.txt
index 5b29f25..c6511b1 100644 (file)
--- a/UPDATING.txt
+++ b/UPDATING.txt
@@ -1,5 +1,5 @@
 PukiWiki UPDATING
-$Id: UPDATING.txt,v 1.28 2005/08/14 13:32:43 henoheno Exp $
+$Id: UPDATING.txt,v 1.29 2005/08/19 14:56:20 henoheno Exp $
 
 
 ¸ß´¹À­¤Ë´Ø¤¹¤ëµ­½Ò
@@ -7,26 +7,20 @@ $Id: UPDATING.txt,v 1.28 2005/08/14 13:32:43 henoheno Exp $
 
 PukiWiki 1.4.6: PukiWiki PukiWiki 1.4.5_1 ¤È¤ÎÈó¸ß´¹ÅÀ
 
-    1. ´ÉÍý¼Ô¥Ñ¥¹¥ï¡¼¥É(½¾Íè¤ÏMD5¥Ï¥Ã¥·¥å¤Î¤ß)¤È¥Ù¡¼¥·¥Ã¥¯Ç§¾Ú¤Î
-       ¥æ¡¼¥¶¡¼¥Ñ¥¹¥ï¡¼¥É(½¾Íè¤Ïʿʸ¤Î¤ß)¤Ë¤Ä¤¤¤Æ¡¢ÊݸÊýË¡¤ò¶å¼ï
-       Îà(¤¦¤Á¸Þ¼ïÎà¤Ï OpenLDAP ¸ß´¹)¤ÎÃ椫¤éÁªÂò¤Ç¤­¤ëÍͤˤʤê¤Þ
-       ¤·¤¿¡£
+    1. ´ÉÍý¼Ô¥Ñ¥¹¥ï¡¼¥É¤È¥Ù¡¼¥·¥Ã¥¯Ç§¾Ú¤ÇÍѤ¤¤ë¥æ¡¼¥¶¡¼¥Ñ¥¹¥ï¡¼¥É¤Ë
+       ¤Ä¤¤¤Æ¡¢¥Ñ¥¹¥ï¡¼¥É¤ÎÊݸÊýË¡¤ò¶å¼ïÎà¤ÎÃ椫¤éÁªÂò¤Ç¤­¤ëÍͤˤÊ
+       ¤ê¤Þ¤·¤¿¡£¤³¤Î»ØÄêÊýË¡¤Ï LDAP ¤Ç»ÈÍѤµ¤ì¤Æ¤¤¤ë¤â¤Î¤ÈƱ°ì¤Ç¡¢
+       RFC2307¤Ë½àµò¤·¤Æ¤¤¤Þ¤¹¡£(¤¦¤Á¸Þ¼ïÎà¤Ï OpenLDAP ¸ß´¹)
 
-       Ê£¿ô¤Î¥Õ¥©¡¼¥Þ¥Ã¥È¤ËÂбþ¤¹¤ë¤¿¤á¡¢º£¸å¤Ï¥Ñ¥¹¥ï¡¼¥É(¥Ï¥Ã¥·
-       ¥å)¤ÎÀèƬ¤Ë¡¢¤½¤ÎÊݸÊýË¡(¥¹¥­¡¼¥à)¤¬²¿¤Ç¤¢¤ë¤«¤òɽµ­¤¹¤ë
-       ɬÍפ¬¤¢¤ê¤Þ¤¹¡£¤³¤Î»ØÄêÊýË¡¤Ï LDAP ¤Ç»ÈÍѤµ¤ì¤Æ¤¤¤ë¤â¤Î¤È
-       Ʊ°ì¤Ç¡¢RFC2307¤Ë½àµò¤·¤Æ¤¤¤Þ¤¹¡£
-
-       ´ÉÍý¼Ô¥Ñ¥¹¥ï¡¼¥É¤Ë½¾ÍèÄ̤êMD5¥Ï¥Ã¥·¥å¤òÍѤ¤¤ë¾ì¹ç¡¢°Ê²¼¤Î
-       Íͤˡ¢¥Ï¥Ã¥·¥å¤ÎÀèƬ¤Ë '{x-php-md5}' ¤òÄɲ䷤Ʋ¼¤µ¤¤¡£
+       ¤½¤Î¤¿¤á¡¢º£¸å¤Ï¥Ñ¥¹¥ï¡¼¥É¤ÎÀèƬ¤Ë¡¢¤½¤ÎÊݸÊýË¡(¥¹¥­¡¼¥à)¤¬
+       ²¿¤Ç¤¢¤ë¤«¤òÌÀµ­¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£Î㤨¤Ð½¾ÍèÄ̤êMD5¥Ï¥Ã¥·¥å
+       ¤òÍѤ¤¤ë¾ì¹ç¡¢ÀèƬ¤Ë '{x-php-md5}' ¤òÄɲ䷤Ʋ¼¤µ¤¤¡£
 
        // md5('pass')
        $adminpass = '{x-php-md5}1a1dc91c907325c69271ddf0c944bc72';
 
-       ¥Ù¡¼¥·¥Ã¥¯Ç§¾Ú¤Ë¤Ä¤¤¤Æ(½¾ÍèÄ̤ê)ʿʸ¤Ç¥Ñ¥¹¥ï¡¼¥É¤òÊݸ¤¹
-       ¤ë¾ì¹ç¡¢ÆäËÃͤòÊѹ¹¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£
-       ¥Õ¥©¡¼¥Þ¥Ã¥È¤ÎÀë¸À¤¬¤Ê¤¤¤È¤­¡¢¥Ñ¥¹¥ï¡¼¥É¤Ïʿʸ¤ÇÊݸ¤µ¤ì¤Æ
-       ¤¤¤ë¤È²ò¼á¤µ¤ì¤Þ¤¹¡£
+       ¥¹¥­¡¼¥à¤ÎÀë¸À¤¬¤Ê¤¤¤È¤­¡¢¥Ñ¥¹¥ï¡¼¥É¤Ïʿʸ¤ÇÊݸ¤µ¤ì¤Æ¤¤¤ë
+       ¤È²ò¼á¤µ¤ì¤Þ¤¹¡£
 
        $auth_users = array(
            'foo'  => 'foo_passwd', // ʿʸ (¿ä¾©¤·¤Þ¤»¤ó)
@@ -56,17 +50,17 @@ PukiWiki 1.4.6: PukiWiki PukiWiki 1.4.5_1 
        ¤·¤¿¤¬¤Ã¤Æ³ºÅö¤¹¤ë´Ä¶­¤Ç¤Ê¤±¤ì¤Ð¡¢¤³¤ì¤é¤Î¥Ñ¥¹¥ï¡¼¥ÉÊݸÊý
        ¼°¤òÍøÍѤ¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
 
-    4. ¥Ú¡¼¥¸¤òɽ¼¨¤¹¤ëºÝ¤Ë¡¢¥×¥é¥°¥¤¥óËè¤Î¸Æ¤Ó½Ð¤·²ó¿ô¤ò¥Á¥§¥Ã¥¯
-       ¤¹¤ëµ¡¹½¤¬Äɲ䵤ì¤Þ¤·¤¿¡£¤³¤Î·ë²Ì¡¢¤¤¤º¤ì¤«¤Î¥×¥é¥°¥¤¥ó¤¬
-       °ìÄê²ó¿ô (¥Ç¥Õ¥©¥ë¥È:768²ó) ¤ò±Û¤¨¤Æ¸Æ¤Ó½Ð¤µ¤ì¤¿¾ì¹ç¡¢Â¨ºÂ¤Ë
-       ¥á¥Ã¥»¡¼¥¸¤È¥ê¥ó¥¯¤òɽ¼¨¤·¤¿¸å¡¢½ÐÎϽèÍý¤¬½ªÎ»¤·¤Þ¤¹¡£
-
-       ¤³¤ì¤ÏDoS¹¶·â¤òÈò¤±¤ë¤¿¤á¤Î¥ê¥ß¥Ã¥¿¡¼¤Ç¤¹¤¬¡¢Èó¾ï¤ËŤ¤Ê¸
-       ½ñ¤ÎÃæ¤ËƱ°ì¤Î¥×¥é¥°¥¤¥ó¤ò°ìÄê¸Ä¿ô°Ê¾åµ­ºÜ¤·¤Æ¤¤¤ë¾ì¹ç¤Ë¡¢
-       ±ÜÍ÷¤¬¹Ô¤¨¤Ê¤¯¤Ê¤ë²ÄǽÀ­¤ò¤â¤¿¤é¤·¤Þ¤¹¡£¤½¤Î¤è¤¦¤Ê¾ì¹ç¡¢
-       ɬÍפ˱þ¤¸¤Æ lib/plugin.php ¤Ë¤¢¤ëÄê¿ô
-       PKWK_PLUGIN_CALL_TIME_LIMIT ¤ÎÃͤò³ÈÂ礹¤ë¤«¡¢(ÊÔ½¸¤Ï²Äǽ
-       ¤Ç¤¢¤í¤¦¤¿¤á)³ºÅö¥Ú¡¼¥¸¤Î¥³¥ó¥Æ¥ó¥Ä¤òŬµ¹Ê£¿ô¤Î¥Ú¡¼¥¸¤Ëʬ
+    4. ¥µ¡¼¥Ð¡¼¤Ø¤ÎDoS¹¶·â¤ò²óÈò¤ë¤¿¤á¤Î¥ê¥ß¥Ã¥¿¡¼¤È¤·¤Æ¡¢¥×¥é¥°¥¤¥ó
+       ¤Î¸Æ¤Ó½Ð¤·²ó¿ô¤ò¥Á¥§¥Ã¥¯¤¹¤ëµ¡¹½¤¬Äɲ䵤ì¤Þ¤·¤¿¡£
+       ¤³¤Î·ë²Ì¡¢¤¤¤º¤ì¤«¤Î¥×¥é¥°¥¤¥ó¤¬°ìÄê²ó¿ô (¥Ç¥Õ¥©¥ë¥È:768²ó)
+       ¤ò±Û¤¨¤Æ¸Æ¤Ó½Ð¤µ¤ì¤¿¾ì¹ç¡¢Â¨ºÂ¤Ë¥á¥Ã¥»¡¼¥¸¤È¥ê¥ó¥¯¤òɽ¼¨¤·¤¿
+       ¸å¡¢½ÐÎϽèÍý¤¬½ªÎ»¤·¤Þ¤¹¡£
+
+       ¤½¤Î¤¿¤á¡¢Èó¾ï¤ËŤ¤Ê¸½ñ¤ÎÃæ¤ËƱ°ì¤Î¥×¥é¥°¥¤¥ó¤ò°ìÄê¸Ä¿ô°Ê¾å
+       µ­ºÜ¤·¤Æ¤¤¤ë¾ì¹ç¤Ë¡¢±ÜÍ÷¤¬¹Ô¤¨¤Ê¤¯¤Ê¤ë²ÄǽÀ­(ÊÔ½¸¤Ï²Äǽ)¤ò¤â
+       ¤¿¤é¤·¤Þ¤¹¡£¤½¤Î¤è¤¦¤Ê¾ì¹ç¡¢É¬Íפ˱þ¤¸¤Æ lib/plugin.php ¤Ë¤¢
+       ¤ëÄê¿ôPKWK_PLUGIN_CALL_TIME_LIMIT ¤ÎÃͤò³ÈÂ礹¤ë¤«¡¢(ÊÔ½¸¤Ï
+       ²Äǽ¤Ç¤¢¤í¤¦¤¿¤á)³ºÅö¥Ú¡¼¥¸¤Î¥³¥ó¥Æ¥ó¥Ä¤òŬµ¹Ê£¿ô¤Î¥Ú¡¼¥¸¤Ëʬ
        ³ä¤·¤Æ²¼¤µ¤¤¡£
 
        ¤³¤Î¾ì¹ç¤Î¥×¥é¥°¥¤¥ó¤È¤Ï¡¢¥Ö¥í¥Ã¥¯·¿ ¡Ö#¥×¥é¥°¥¤¥ó̾¡×
@@ -112,6 +106,19 @@ PukiWiki 1.4.6: PukiWiki PukiWiki 1.4.5_1 
        PKWK_OPTIMISE ¤¬Ìµ¸ú¤È¤Ê¤Ã¤Æ¤¤¤ë»þ¤Ë¤Ï¡¢From: ¤¬½ÅÊ£¤·¤Æ¤¤¤ë
        ¤«¤É¤¦¤«¤Ê¤É¤Î¥Á¥§¥Ã¥¯¤¬¹Ô¤ï¤ì¡¢¤¢¤ì¤Ð¥¨¥é¡¼¤òɽ¼¨¤·¤Þ¤¹¡£
 
+    8. ²èÁü¤Î¤è¤¦¤Ë¸«¤¨¤ëURI¤ò¡Ö¥¤¥ó¥é¥¤¥ó²èÁü¤È¤·¤Æ¥ê¥ó¥¯¡×¤·¤Ê¤¤
+       ¤¿¤á¤ÎÄê¿ô PKWK_DISABLE_INLINE_IMAGE_FROM_URI ¤òÍ­¸ú¤Ë¤¹¤ë¤³
+       ¤È¤Ë¤è¤ê¡¢¤Þ¤µ¤Ë³ºÅö¤Îµ¡Ç½¤ò¼Â¸½¤¹¤ë¡Öimg¥×¥é¥°¥¤¥ó¡×¤Ïµ¡Ç½¤¬
+       ̵¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£(BugTrack2/69)
+
+       ¤½¤Î·ë²Ì¡¢#img(,clear) ¤È¤¤¤¦É½µ­¤Ç¡Ö¥Æ¥­¥¹¥È¤Î²ó¤ê¹þ¤ß»ØÄê
+       ¤ò²ò½ü¡×¤¹¤ëµ¡Ç½¤â̵¸ú¤Ë¤Ê¤ê¤Þ¤¹¡£¤³¤Îµ¡Ç½¤Ï img ¥×¥é¥°¥¤¥ó
+       ¤È¥»¥Ã¥È¤ÇÍѤ¤¤ë¤¿¤á¤ËÍÑ°Õ¤µ¤ì¤¿¤â¤Î¤Ç¤¢¤ë¤¿¤á¡¢¤³¤ì¤òÉôʬŪ
+       ¤ËÍ­¸ú¤Ë¤·¤¿¾ì¹ç¤Î±Æ¶Á¤Ïͽ¬¤Ç¤­¤Þ¤»¤ó¡£
+
+       #img¥×¥é¥°¥¤¥ó¤È̵´Ø·¸¤ÊÉôʬ¤Ç¤¢¤ì¤Ð¡¢#img(,clear)¤ÎÂå¤ï¤ê¤Ë¡¢
+       ¤½¤ìƱ¤¸µ¡Ç½¤òÍ­¤¹¤ë #clear¥×¥é¥°¥¤¥ó ¤ò»ÈÍѤ·¤Æ²¼¤µ¤¤¡£
+
 
 PukiWiki 1.4.5_1: PukiWiki 1.4.4¤È¤ÎÈó¸ß´¹ÅÀ