nlopess Wed Jul 20 14:45:50 2005 EDT
Modified files:
/phpdoc/en/reference/msql ini.xml
/phpdoc/en/reference/sybase ini.xml
/phpdoc/en/appendices ini.xml
/phpdoc/en/reference/ibm_db2 ini.xml
/phpdoc/scripts/iniupdate generate_changelog.php ini_search_lib.php
Log:
second take of updates. add all cfg_get_*() stuff (that are 'magically'
guessed
http://cvs.php.net/diff.php/phpdoc/en/reference/msql/ini.xml?r1=1.5&r2=1.6&ty=u
Index: phpdoc/en/reference/msql/ini.xml
diff -u phpdoc/en/reference/msql/ini.xml:1.5
phpdoc/en/reference/msql/ini.xml:1.6
--- phpdoc/en/reference/msql/ini.xml:1.5 Tue Feb 22 12:36:08 2005
+++ phpdoc/en/reference/msql/ini.xml Wed Jul 20 14:45:47 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<section id="msql.configuration">
&reftitle.runtime;
&extension.runtime;
@@ -18,20 +18,20 @@
<tbody>
<row>
<entry>msql.allow_persistent</entry>
- <entry>"On"</entry>
- <entry>PHP_INI_SYSTEM</entry>
+ <entry>"1"</entry>
+ <entry>PHP_INI_ALL</entry>
<entry></entry>
</row>
<row>
<entry>msql.max_persistent</entry>
<entry>"-1"</entry>
- <entry>PHP_INI_SYSTEM</entry>
+ <entry>PHP_INI_ALL</entry>
<entry></entry>
</row>
<row>
<entry>msql.max_links</entry>
<entry>"-1"</entry>
- <entry>PHP_INI_SYSTEM</entry>
+ <entry>PHP_INI_ALL</entry>
<entry></entry>
</row>
</tbody>
http://cvs.php.net/diff.php/phpdoc/en/reference/sybase/ini.xml?r1=1.15&r2=1.16&ty=u
Index: phpdoc/en/reference/sybase/ini.xml
diff -u phpdoc/en/reference/sybase/ini.xml:1.15
phpdoc/en/reference/sybase/ini.xml:1.16
--- phpdoc/en/reference/sybase/ini.xml:1.15 Wed Apr 27 10:20:09 2005
+++ phpdoc/en/reference/sybase/ini.xml Wed Jul 20 14:45:49 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.15 $ -->
+<!-- $Revision: 1.16 $ -->
<section id="sybase.configuration">
&reftitle.runtime;
&extension.runtime;
@@ -18,21 +18,21 @@
<tbody>
<row>
<entry>sybase.allow_persistent</entry>
- <entry>"On"</entry>
- <entry>PHP_INI_SYSTEM</entry>
- <entry></entry>
+ <entry>"1"</entry>
+ <entry>PHP_INI_ALL</entry>
+ <entry>Available since PHP 4.0.3.</entry>
</row>
<row>
<entry>sybase.max_persistent</entry>
<entry>"-1"</entry>
- <entry>PHP_INI_SYSTEM</entry>
- <entry></entry>
+ <entry>PHP_INI_ALL</entry>
+ <entry>Available since PHP 4.0.3.</entry>
</row>
<row>
<entry>sybase.max_links</entry>
<entry>"-1"</entry>
- <entry>PHP_INI_SYSTEM</entry>
- <entry></entry>
+ <entry>PHP_INI_ALL</entry>
+ <entry>Available since PHP 4.0.3.</entry>
</row>
<row>
<entry>sybase.interface_file </entry>
@@ -54,8 +54,8 @@
</row>
<row>
<entry>sybase.compatability_mode</entry>
- <entry>"Off"</entry>
- <entry>PHP_INI_SYSTEM</entry>
+ <entry>"0"</entry>
+ <entry>PHP_INI_ALL</entry>
<entry></entry>
</row>
<row>
http://cvs.php.net/diff.php/phpdoc/en/appendices/ini.xml?r1=1.24&r2=1.25&ty=u
Index: phpdoc/en/appendices/ini.xml
diff -u phpdoc/en/appendices/ini.xml:1.24 phpdoc/en/appendices/ini.xml:1.25
--- phpdoc/en/appendices/ini.xml:1.24 Wed Jul 20 13:14:02 2005
+++ phpdoc/en/appendices/ini.xml Wed Jul 20 14:45:49 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.24 $ -->
+<!-- $Revision: 1.25 $ -->
<appendix id="ini">
<title>&php.ini; directives</title>
@@ -210,6 +210,12 @@
<entry>Available since PHP 5.0.0.</entry>
</row>
<row>
+ <entry>birdstep.max_links</entry>
+ <entry>"-1"</entry>
+ <entry>PHP_INI_ALL</entry>
+ <entry></entry>
+ </row>
+ <row>
<entry>blenc.key_file</entry>
<entry>"/usr/local/etc/blenckeys"</entry>
<entry>PHP_INI_ALL</entry>
@@ -222,6 +228,36 @@
<entry></entry>
</row>
<row>
+ <entry><link
linkend="ini.cgi.fix-pathinfo">cgi.fix_pathinfo</link></entry>
+ <entry>"1"</entry>
+ <entry>PHP_INI_ALL</entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry><link
linkend="ini.cgi.force-redirect">cgi.force_redirect</link></entry>
+ <entry>"1"</entry>
+ <entry>PHP_INI_ALL</entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry>cgi.nph</entry>
+ <entry>"0"</entry>
+ <entry>PHP_INI_ALL</entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry><link
linkend="ini.cgi.redirect-status-env">cgi.redirect_status_env</link></entry>
+ <entry>NULL</entry>
+ <entry>PHP_INI_ALL</entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry><link
linkend="ini.cgi.rfc2616-headers">cgi.rfc2616_headers</link></entry>
+ <entry>"0"</entry>
+ <entry>PHP_INI_ALL</entry>
+ <entry></entry>
+ </row>
+ <row>
<entry><link
linkend="ini.child-terminate">child_terminate</link></entry>
<entry>"0"</entry>
<entry>PHP_INI_ALL</entry>
@@ -492,6 +528,18 @@
<entry></entry>
</row>
<row>
+ <entry><link
linkend="ini.fastcgi.impersonate">fastcgi.impersonate</link></entry>
+ <entry>"0"</entry>
+ <entry>PHP_INI_ALL</entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry>fastcgi.logging</entry>
+ <entry>"1"</entry>
+ <entry>PHP_INI_ALL</entry>
+ <entry></entry>
+ </row>
+ <row>
<entry>fbsql.allow_persistent</entry>
<entry>"1"</entry>
<entry>PHP_INI_SYSTEM</entry>
@@ -507,7 +555,7 @@
<entry>fbsql.batchsize</entry>
<entry>"1000"</entry>
<entry>PHP_INI_ALL</entry>
- <entry>Available since PHP 5-cvs.</entry>
+ <entry>Available since PHP 5.1.0.</entry>
</row>
<row>
<entry>fbsql.default_database</entry>
@@ -582,6 +630,12 @@
<entry></entry>
</row>
<row>
+ <entry><link linkend="ini.from">from</link></entry>
+ <entry>""</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>
@@ -708,13 +762,13 @@
<entry></entry>
</row>
<row>
- <entry>ibm_db2.binmode</entry>
+ <entry><link
linkend="ini.ibm-db2.binmode">ibm_db2.binmode</link></entry>
<entry>"1"</entry>
<entry>PHP_INI_ALL</entry>
<entry></entry>
</row>
<row>
- <entry>ibm_db2.instance_name</entry>
+ <entry><link
linkend="ini.ibm-db2.instance-name">ibm_db2.instance_name</link></entry>
<entry>NULL</entry>
<entry>PHP_INI_SYSTEM</entry>
<entry></entry>
@@ -1092,6 +1146,24 @@
<entry>Available since PHP 4.3.0.</entry>
</row>
<row>
+ <entry><link
linkend="ini.msql.allow-persistent">msql.allow_persistent</link></entry>
+ <entry>"1"</entry>
+ <entry>PHP_INI_ALL</entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry><link linkend="ini.msql.max-links">msql.max_links</link></entry>
+ <entry>"-1"</entry>
+ <entry>PHP_INI_ALL</entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry><link
linkend="ini.msql.max-persistent">msql.max_persistent</link></entry>
+ <entry>"-1"</entry>
+ <entry>PHP_INI_ALL</entry>
+ <entry></entry>
+ </row>
+ <row>
<entry>mssql.allow_persistent</entry>
<entry>"1"</entry>
<entry>PHP_INI_SYSTEM</entry>
@@ -1386,6 +1458,24 @@
<entry></entry>
</row>
<row>
+ <entry>oracle.allow_persistent</entry>
+ <entry>"-1"</entry>
+ <entry>PHP_INI_ALL</entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry>oracle.max_links</entry>
+ <entry>"-1"</entry>
+ <entry>PHP_INI_ALL</entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry>oracle.max_persistent</entry>
+ <entry>"-1"</entry>
+ <entry>PHP_INI_ALL</entry>
+ <entry></entry>
+ </row>
+ <row>
<entry><link
linkend="ini.output-buffering">output_buffering</link></entry>
<entry>"0"</entry>
<entry>PHP_INI_PERDIR</entry>
@@ -1398,6 +1488,12 @@
<entry>Available since PHP 4.0.4.</entry>
</row>
<row>
+ <entry>pdo_odbc.connection_pooling</entry>
+ <entry>"strict"</entry>
+ <entry>PHP_INI_ALL</entry>
+ <entry></entry>
+ </row>
+ <row>
<entry>pfpro.defaulthost</entry>
<entry>"test-payflow.verisign.com"</entry>
<entry>PHP_INI_ALL</entry>
@@ -1497,13 +1593,13 @@
<entry>realpath_cache_size</entry>
<entry>"16K"</entry>
<entry>PHP_INI_SYSTEM</entry>
- <entry>Available since PHP 5-cvs.</entry>
+ <entry>Available since PHP 5.1.0.</entry>
</row>
<row>
<entry>realpath_cache_ttl</entry>
<entry>"120"</entry>
<entry>PHP_INI_SYSTEM</entry>
- <entry>Available since PHP 5-cvs.</entry>
+ <entry>Available since PHP 5.1.0.</entry>
</row>
<row>
<entry><link
linkend="ini.register-argc-argv">register_argc_argv</link></entry>
@@ -1896,6 +1992,48 @@
<entry>Available since PHP 5.0.0.</entry>
</row>
<row>
+ <entry><link
linkend="ini.sybase.allow-persistent">sybase.allow_persistent</link></entry>
+ <entry>"1"</entry>
+ <entry>PHP_INI_ALL</entry>
+ <entry>Available since PHP 4.0.3.</entry>
+ </row>
+ <row>
+ <entry><link
linkend="ini.sybase.compatability-mode">sybase.compatability_mode</link></entry>
+ <entry>"0"</entry>
+ <entry>PHP_INI_ALL</entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry>sybase.interface_file</entry>
+ <entry>""</entry>
+ <entry>PHP_INI_ALL</entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry><link
linkend="ini.sybase.max-links">sybase.max_links</link></entry>
+ <entry>"-1"</entry>
+ <entry>PHP_INI_ALL</entry>
+ <entry>Available since PHP 4.0.3.</entry>
+ </row>
+ <row>
+ <entry><link
linkend="ini.sybase.max-persistent">sybase.max_persistent</link></entry>
+ <entry>"-1"</entry>
+ <entry>PHP_INI_ALL</entry>
+ <entry>Available since PHP 4.0.3.</entry>
+ </row>
+ <row>
+ <entry><link
linkend="ini.sybase.min-error-severity">sybase.min_error_severity</link></entry>
+ <entry>"10"</entry>
+ <entry>PHP_INI_ALL</entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry><link
linkend="ini.sybase.min-message-severity">sybase.min_message_severity</link></entry>
+ <entry>"10"</entry>
+ <entry>PHP_INI_ALL</entry>
+ <entry></entry>
+ </row>
+ <row>
<entry><link
linkend="ini.sybct.allow-persistent">sybct.allow_persistent</link></entry>
<entry>"1"</entry>
<entry>PHP_INI_SYSTEM</entry>
@@ -1944,6 +2082,24 @@
<entry>Available since PHP 4.0.4.</entry>
</row>
<row>
+ <entry>sybct.packet_size</entry>
+ <entry>"0"</entry>
+ <entry>PHP_INI_ALL</entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry><link linkend="ini.sybct.timeout">sybct.timeout</link></entry>
+ <entry>"0"</entry>
+ <entry>PHP_INI_ALL</entry>
+ <entry></entry>
+ </row>
+ <row>
+ <entry>sysvshm.init_mem</entry>
+ <entry>"10000"</entry>
+ <entry>PHP_INI_ALL</entry>
+ <entry></entry>
+ </row>
+ <row>
<entry><link
linkend="ini.tidy.clean-output">tidy.clean_output</link></entry>
<entry>"0"</entry>
<entry>PHP_INI_PERDIR</entry>
@@ -2942,32 +3098,32 @@
</row>
<row>
<entry>cgi.fix_pathinfo</entry>
- <entry>"0"</entry>
- <entry>PHP_INI_SYSTEM</entry>
+ <entry>"1"</entry>
+ <entry>PHP_INI_ALL</entry>
<entry></entry>
</row>
<row>
<entry>cgi.force_redirect</entry>
<entry>"1"</entry>
- <entry>PHP_INI_SYSTEM</entry>
+ <entry>PHP_INI_ALL</entry>
<entry></entry>
</row>
<row>
<entry>cgi.redirect_status_env</entry>
- <entry>""</entry>
- <entry>PHP_INI_SYSTEM</entry>
+ <entry>NULL</entry>
+ <entry>PHP_INI_ALL</entry>
<entry></entry>
</row>
<row>
<entry>fastcgi.impersonate</entry>
<entry>"0"</entry>
- <entry>PHP_INI_SYSTEM</entry>
+ <entry>PHP_INI_ALL</entry>
<entry></entry>
</row>
<row>
<entry>cgi.rfc2616_headers</entry>
<entry>"0"</entry>
- <entry>PHP_INI_SYSTEM</entry>
+ <entry>PHP_INI_ALL</entry>
<entry></entry>
</row>
</tbody>
http://cvs.php.net/diff.php/phpdoc/en/reference/ibm_db2/ini.xml?r1=1.2&r2=1.3&ty=u
Index: phpdoc/en/reference/ibm_db2/ini.xml
diff -u phpdoc/en/reference/ibm_db2/ini.xml:1.2
phpdoc/en/reference/ibm_db2/ini.xml:1.3
--- phpdoc/en/reference/ibm_db2/ini.xml:1.2 Wed Jul 20 13:14:03 2005
+++ phpdoc/en/reference/ibm_db2/ini.xml Wed Jul 20 14:45:50 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<section id="extname.configuration">
&reftitle.runtime;
&extension.runtime;
@@ -38,9 +38,9 @@
<para>
<variablelist>
- <varlistentry id="ini.extname.ibm-db2.binmode">
+ <varlistentry id="ini.ibm-db2.binmode">
<term>
- <parameter>ibm-db2.binmode</parameter>
+ <parameter>ibm_db2.binmode</parameter>
<type>integer</type>
</term>
<listitem>
@@ -67,9 +67,9 @@
</para>
</listitem>
</varlistentry>
- <varlistentry id="ini.extname.ibm-db2.instance-name">
+ <varlistentry id="ini.ibm-db2.instance-name">
<term>
- <parameter>ibm-db2.instance-name</parameter>
+ <parameter>ibm_db2.instance_name</parameter>
<type>string</type>
</term>
<listitem>
http://cvs.php.net/diff.php/phpdoc/scripts/iniupdate/generate_changelog.php?r1=1.3&r2=1.4&ty=u
Index: phpdoc/scripts/iniupdate/generate_changelog.php
diff -u phpdoc/scripts/iniupdate/generate_changelog.php:1.3
phpdoc/scripts/iniupdate/generate_changelog.php:1.4
--- phpdoc/scripts/iniupdate/generate_changelog.php:1.3 Tue Jun 28 12:59:35 2005
+++ phpdoc/scripts/iniupdate/generate_changelog.php Wed Jul 20 14:45:50 2005
@@ -17,11 +17,18 @@
+----------------------------------------------------------------------+
*/
+// replaces php5-cvs with the following version
+$cvs_version = '5.1.0';
+
+
/** converts a tag like php_5_0_0 into a version like 5.0.0 */
function tag2version($tag) {
- $s = strtr(substr($tag, 4), '_', '.');
+ $version = strtr(substr($tag, 4), '_', '.');
+
+ if ($version == '5.cvs')
+ return $GLOBALS['cvs_version'];
- return substr($s, 2) == 'cvs' ? $s{0} . '-cvs' : $s;
+ return $version;
}
http://cvs.php.net/diff.php/phpdoc/scripts/iniupdate/ini_search_lib.php?r1=1.4&r2=1.5&ty=u
Index: phpdoc/scripts/iniupdate/ini_search_lib.php
diff -u phpdoc/scripts/iniupdate/ini_search_lib.php:1.4
phpdoc/scripts/iniupdate/ini_search_lib.php:1.5
--- phpdoc/scripts/iniupdate/ini_search_lib.php:1.4 Wed Jul 20 12:42:13 2005
+++ phpdoc/scripts/iniupdate/ini_search_lib.php Wed Jul 20 14:45:50 2005
@@ -24,9 +24,9 @@
if (is_array($dirs)) {
foreach($dirs as $dir)
- recurse_aux($dir, $search_macros);
+ recurse_aux($dir, $search_macros, $cfg_get);
} else {
- recurse_aux($dirs, $search_macros);
+ recurse_aux($dirs, $search_macros, $cfg_get);
}
/* insert only if the key doesn't exist, as will probably have
@@ -41,8 +41,8 @@
// recurse through the dirs and do the 'dirty work'
-function recurse_aux($dir, $search_macros) {
- global $array, $replace, $cfg_get;
+function recurse_aux($dir, $search_macros, &$cfg_get) {
+ global $array, $replace;
if (is_file($dir)) {
$files = array(basename($dir));
@@ -59,7 +59,7 @@
$path = $dir . '/' .$file;
if(is_dir($path)) {
- recurse_aux($path, $search_macros);
+ recurse_aux($path, $search_macros, $cfg_get);
} else {
$file = file_get_contents($path);
