nlopess Sat Mar 26 08:22:31 2005 EDT
Modified files:
/phpdoc/en/appendices ini.xml
/phpdoc/en/reference/filesystem ini.xml
/phpdoc/en/reference/session ini.xml
/phpdoc/scripts/iniupdate generate_changelog.php ini-update.php
ini_search_lib.php version4.tags
version5.tags
Log:
fix the error that Jakub found in the ini-updater script (regex expression
too permissive)
fix the regex that finds the default value in the ini tables
add latest php releases (yet to release :))
http://cvs.php.net/diff.php/phpdoc/en/appendices/ini.xml?r1=1.15&r2=1.16&ty=u
Index: phpdoc/en/appendices/ini.xml
diff -u phpdoc/en/appendices/ini.xml:1.15 phpdoc/en/appendices/ini.xml:1.16
--- phpdoc/en/appendices/ini.xml:1.15 Fri Mar 25 11:16:11 2005
+++ phpdoc/en/appendices/ini.xml Sat Mar 26 08:22:29 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.15 $ -->
+<!-- $Revision: 1.16 $ -->
<appendix id="ini">
<title>&php.ini; directives</title>
@@ -570,6 +570,12 @@
<entry>PHP_INI_ALL in PHP <= 4.2.3. Available since PHP
4.0.3.</entry>
</row>
<row>
+ <entry>filter.default</entry>
+ <entry>"notags"</entry>
+ <entry>PHP_INI_ALL</entry>
+ <entry></entry>
+ </row>
+ <row>
<entry><link
linkend="ini.syntax-highlighting">highlight.bg</link></entry>
<entry>"#FFFFFF"</entry>
<entry>PHP_INI_ALL</entry>
@@ -613,7 +619,7 @@
</row>
<row>
<entry>http.allowed_methods</entry>
- <entry>"OPTIONS,GET,HEAD,POST,PUT,DELETE,TRACE,CONNECT"</entry>
+ <entry>"GET, HEAD, POST, PUT, DELETE, OPTIONS, TRACE, CONNECT, "</entry>
<entry>PHP_INI_ALL</entry>
<entry></entry>
</row>
@@ -936,7 +942,7 @@
<entry></entry>
</row>
<row>
- <entry>maxdb.default_pw</entry>
+ <entry><link
linkend="ini.maxdb.default-pw">maxdb.default_pw</link></entry>
<entry>NULL</entry>
<entry>PHP_INI_ALL</entry>
<entry></entry>
@@ -1695,7 +1701,7 @@
<entry><link
linkend="ini.session.use-trans-sid">session.use_trans_sid</link></entry>
<entry>"0"</entry>
<entry>PHP_INI_ALL</entry>
- <entry>PHP_INI_ALL in PHP <= 4.2.3. PHP_INI_PERDIR in PHP <=
4-cvs. Available since PHP 4.0.3.</entry>
+ <entry>PHP_INI_ALL in PHP <= 4.2.3. PHP_INI_PERDIR in PHP < 5.
Available since PHP 4.0.3.</entry>
</row>
<row>
<entry>session_pgsql.create_table</entry>
http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/ini.xml?r1=1.10&r2=1.11&ty=u
Index: phpdoc/en/reference/filesystem/ini.xml
diff -u phpdoc/en/reference/filesystem/ini.xml:1.10
phpdoc/en/reference/filesystem/ini.xml:1.11
--- phpdoc/en/reference/filesystem/ini.xml:1.10 Tue Feb 22 12:36:06 2005
+++ phpdoc/en/reference/filesystem/ini.xml Sat Mar 26 08:22:31 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
<section id="filesystem.configuration">
&reftitle.runtime;
&extension.runtime;
@@ -125,7 +125,7 @@
<varlistentry id="ini.from">
<term>
- <parameter>from="[EMAIL PROTECTED]"</parameter>
+ <parameter>from</parameter>
<type>string</type>
</term>
<listitem>
http://cvs.php.net/diff.php/phpdoc/en/reference/session/ini.xml?r1=1.31&r2=1.32&ty=u
Index: phpdoc/en/reference/session/ini.xml
diff -u phpdoc/en/reference/session/ini.xml:1.31
phpdoc/en/reference/session/ini.xml:1.32
--- phpdoc/en/reference/session/ini.xml:1.31 Tue Feb 22 12:36:10 2005
+++ phpdoc/en/reference/session/ini.xml Sat Mar 26 08:22:31 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.31 $ -->
+<!-- $Revision: 1.32 $ -->
<section id="session.configuration">
&reftitle.runtime;
&extension.runtime;
@@ -134,7 +134,7 @@
<entry>session.use_trans_sid</entry>
<entry>"0"</entry>
<entry>PHP_INI_ALL</entry>
- <entry>PHP_INI_ALL in PHP <= 4.2.3. PHP_INI_PERDIR in PHP <= 4-cvs.
Available since PHP 4.0.3.</entry>
+ <entry>PHP_INI_ALL in PHP <= 4.2.3. PHP_INI_PERDIR in PHP < 5.
Available since PHP 4.0.3.</entry>
</row>
<row>
<entry>session.bug_compat_42</entry>
http://cvs.php.net/diff.php/phpdoc/scripts/iniupdate/generate_changelog.php?r1=1.1&r2=1.2&ty=u
Index: phpdoc/scripts/iniupdate/generate_changelog.php
diff -u phpdoc/scripts/iniupdate/generate_changelog.php:1.1
phpdoc/scripts/iniupdate/generate_changelog.php:1.2
--- phpdoc/scripts/iniupdate/generate_changelog.php:1.1 Tue Feb 22 12:54:58 2005
+++ phpdoc/scripts/iniupdate/generate_changelog.php Sat Mar 26 08:22:31 2005
@@ -80,7 +80,11 @@
if ($val) {
if (isset($old)) {
if ($val != $old) {
- $str .= " $old in PHP <= " . tag2version($old_tag) .
'.';
+ if ($old_tag == 'php_4_cvs') {
+ $str .= " $old in PHP < 5.";
+ } else {
+ $str .= " $old in PHP <= " . tag2version($old_tag)
. '.';
+ }
}
}
http://cvs.php.net/diff.php/phpdoc/scripts/iniupdate/ini-update.php?r1=1.1&r2=1.2&ty=u
Index: phpdoc/scripts/iniupdate/ini-update.php
diff -u phpdoc/scripts/iniupdate/ini-update.php:1.1
phpdoc/scripts/iniupdate/ini-update.php:1.2
--- phpdoc/scripts/iniupdate/ini-update.php:1.1 Tue Feb 22 12:54:58 2005
+++ phpdoc/scripts/iniupdate/ini-update.php Sat Mar 26 08:22:31 2005
@@ -23,7 +23,7 @@
$php_src_dir = '../../../php-src'; //php-src path
$pecl_dir = '../../../pecl'; //pecl path
-$phpdoc_dir = '../../'; //phpdoc path
+$phpdoc_dir = '../..'; //phpdoc path
/******* END of configurations *****/
@@ -54,12 +54,12 @@
$file = preg_replace('@(//.*$)|(/\*.*\*/)@SmsU', '', $file);
/* The MAGIC Regexp :) */
-
if(preg_match_all('/(?:PHP|ZEND)_INI_(?:ENTRY(?:_EX)?|BOOLEAN)\s*\(\s*"([^"]+)"\s*,\s*("\S*"|[^,]+)\s*,\s*([^,]+)/S',
$file, $matches)) {
+
if(preg_match_all('/(?:PHP|ZEND)_INI_(?:ENTRY(?:_EX)?|BOOLEAN)\s*\(\s*"([^"]+)"\s*,((?:".*"|[^,])+)\s*,\s*([^,]+)/S',
$file, $matches)) {
$count = count($matches[0]);
for($i=0;$i<$count;$i++) {
- $default = htmlspecialchars($matches[2][$i], ENT_NOQUOTES);
+ $default = htmlspecialchars(trim($matches[2][$i]),
ENT_NOQUOTES);
$permissions = preg_replace(array('/\s+/', '/ZEND/'),
array('', 'PHP'), $matches[3][$i]);
$permissions = ($permissions ==
'PHP_INI_PERDIR|PHP_INI_SYSTEM' || $permissions ==
'PHP_INI_SYSTEM|PHP_INI_PERDIR') ? 'PHP_INI_PERDIR' : $permissions;
@@ -97,7 +97,7 @@
// remove old permissions constants usage about PHP_INI_PERDIR
$file =
preg_replace('/(?:PHP_INI_SYSTEM\s*\|\s*)?PHP_INI_PERDIR(?:\s*\|\s*PHP_INI_SYSTEM)?/',
'PHP_INI_PERDIR', $file);
- preg_match_all('@<tbody>.+</tbody>@USs', $file, $matches);
+ preg_match_all('@<tgroup\s+cols="4">.+<tbody>.+</tbody>.+</tgroup>@USs',
$file, $matches);
foreach ($matches[0] as $match) {
preg_match_all('@<row>.+</row>@USs', $match, $matches_row);
@@ -128,6 +128,7 @@
// if the file was modified, write the changes
if ($original != $file) {
file_put_contents($filename, $file);
+ echo "Wrote $filename\n";
}
}
@@ -239,7 +240,7 @@
if ($link_files) {
echo "Warning - unmatched links:\n";
foreach ($link_files as $ini => $file) {
- echo str_pad("$ini", 30, " ", STR_PAD_RIGHT) . " => " . substr($file,
strlen($phpdoc_dir)+4) . "\n";
+ echo str_pad($ini, 30, ' ', STR_PAD_RIGHT) . ' => ' . substr($file,
strlen($phpdoc_dir)+4) . "\n";
}
}
@@ -251,7 +252,7 @@
$pos2 = strpos($file, '</tbody>', $pos);
file_put_contents("$phpdoc_dir/en/appendices/ini.xml", substr($file, 0, $pos)
. PHP_EOL . $string . ' ' . substr($file, $pos2));
-
+echo "\n\nWrote the main table\n";
/* fix ini.xml files (if needed) */
http://cvs.php.net/diff.php/phpdoc/scripts/iniupdate/ini_search_lib.php?r1=1.1&r2=1.2&ty=u
Index: phpdoc/scripts/iniupdate/ini_search_lib.php
diff -u phpdoc/scripts/iniupdate/ini_search_lib.php:1.1
phpdoc/scripts/iniupdate/ini_search_lib.php:1.2
--- phpdoc/scripts/iniupdate/ini_search_lib.php:1.1 Tue Feb 22 12:54:58 2005
+++ phpdoc/scripts/iniupdate/ini_search_lib.php Sat Mar 26 08:22:31 2005
@@ -41,12 +41,12 @@
$file = preg_replace('@(//.*$)|(/\*.*\*/)@SmsU', '', $file);
/* The MAGIC Regexp :) */
-
if(preg_match_all('/(?:PHP|ZEND)_INI_(?:ENTRY(?:_EX)?|BOOLEAN)\s*\(\s*"([^"]+)"\s*,\s*("\S*"|[^,]+)\s*,\s*([^,]+)/S',
$file, $matches)) {
+
if(preg_match_all('/(?:PHP|ZEND)_INI_(?:ENTRY(?:_EX)?|BOOLEAN)\s*\(\s*"([^"]+)"\s*,((?:".*"|[^,])+)\s*,\s*([^,]+)/S',
$file, $matches)) {
$count = count($matches[0]);
for($i=0;$i<$count;$i++) {
- $default = htmlspecialchars($matches[2][$i], ENT_NOQUOTES);
+ $default = htmlspecialchars(trim($matches[2][$i]),
ENT_NOQUOTES);
$permissions = preg_replace(array('/\s+/', '/ZEND/'),
array('', 'PHP'), $matches[3][$i]);
$permissions = ($permissions ==
'PHP_INI_PERDIR|PHP_INI_SYSTEM' || $permissions ==
'PHP_INI_SYSTEM|PHP_INI_PERDIR') ? 'PHP_INI_PERDIR' : $permissions;
http://cvs.php.net/diff.php/phpdoc/scripts/iniupdate/version4.tags?r1=1.1&r2=1.2&ty=u
Index: phpdoc/scripts/iniupdate/version4.tags
diff -u phpdoc/scripts/iniupdate/version4.tags:1.1
phpdoc/scripts/iniupdate/version4.tags:1.2
--- phpdoc/scripts/iniupdate/version4.tags:1.1 Tue Feb 22 12:54:58 2005
+++ phpdoc/scripts/iniupdate/version4.tags Sat Mar 26 08:22:31 2005
@@ -23,3 +23,4 @@
php_4_3_8
php_4_3_9
php_4_3_10
+php_4_3_11
http://cvs.php.net/diff.php/phpdoc/scripts/iniupdate/version5.tags?r1=1.1&r2=1.2&ty=u
Index: phpdoc/scripts/iniupdate/version5.tags
diff -u phpdoc/scripts/iniupdate/version5.tags:1.1
phpdoc/scripts/iniupdate/version5.tags:1.2
--- phpdoc/scripts/iniupdate/version5.tags:1.1 Tue Feb 22 12:54:58 2005
+++ phpdoc/scripts/iniupdate/version5.tags Sat Mar 26 08:22:31 2005
@@ -2,3 +2,4 @@
php_5_0_1
php_5_0_2
php_5_0_3
+php_5_0_4
