[PHP-CVS] cvs: php4 /ext/session session.c
sas Sat Sep 21 01:46:32 2002 EDT
Modified files:
/php4/ext/session session.c
Log:
Because track vars are always initialized, get_session_var failed
to work in the register_globals=1 case.
It is now possible again to store session variables in global vars.
Index: php4/ext/session/session.c
diff -u php4/ext/session/session.c:1.313 php4/ext/session/session.c:1.314
--- php4/ext/session/session.c:1.313Thu Aug 15 15:32:08 2002
+++ php4/ext/session/session.c Sat Sep 21 01:46:32 2002
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.313 2002/08/15 19:32:08 kalowsky Exp $ */
+/* $Id: session.c,v 1.314 2002/09/21 05:46:32 sas Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -273,15 +273,24 @@
int php_get_session_var(char *name, size_t namelen, zval ***state_var TSRMLS_DC)
{
+ /*
+* If register_globals is set, the global variable is preferred.
+*
+* If it is not set and track vars are available, track vars are used.
+*/
+
+ if (PG(register_globals)) {
+ return zend_hash_find(&EG(symbol_table), name, namelen+1, (void **)
+state_var);
+ }
+
if (PS(http_session_vars)) {
if (zend_hash_find(Z_ARRVAL_P(PS(http_session_vars)), name, namelen+1,
(void **) state_var)==SUCCESS) {
return SUCCESS;
}
} else if (!PG(register_globals)) {
/* register_globals is disabled, but we don't have http_session_vars */
- return HASH_KEY_NON_EXISTANT;
+ return FAILURE;
}
- return zend_hash_find(&EG(symbol_table), name, namelen+1, (void **) state_var);
}
#define PS_BIN_NR_OF_BITS 8
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /sapi/apache2filter php_apache.h php_functions.c sapi_apache2.c
zeevFri Sep 20 21:53:15 2002 EDT
Modified files:
/php4/sapi/apache2filterphp_apache.h php_functions.c
sapi_apache2.c
Log:
Fix double initialization
Index: php4/sapi/apache2filter/php_apache.h
diff -u php4/sapi/apache2filter/php_apache.h:1.14
php4/sapi/apache2filter/php_apache.h:1.15
--- php4/sapi/apache2filter/php_apache.h:1.14 Thu Apr 18 18:10:57 2002
+++ php4/sapi/apache2filter/php_apache.hFri Sep 20 21:53:15 2002
@@ -44,7 +44,6 @@
int request_processed;
} php_struct;
-int php_apache_register_module(void);
void *merge_php_config(apr_pool_t *p, void *base_conf, void *new_conf);
void *create_php_config(apr_pool_t *p, char *dummy);
void apply_config(void *);
Index: php4/sapi/apache2filter/php_functions.c
diff -u php4/sapi/apache2filter/php_functions.c:1.26
php4/sapi/apache2filter/php_functions.c:1.27
--- php4/sapi/apache2filter/php_functions.c:1.26Wed Sep 18 17:57:30 2002
+++ php4/sapi/apache2filter/php_functions.c Fri Sep 20 21:53:15 2002
@@ -167,11 +167,6 @@
STANDARD_MODULE_PROPERTIES
};
-int php_apache_register_module(void)
-{
- return zend_startup_module(&php_apache_module);
-}
-
/*
* Local variables:
* tab-width: 4
Index: php4/sapi/apache2filter/sapi_apache2.c
diff -u php4/sapi/apache2filter/sapi_apache2.c:1.82
php4/sapi/apache2filter/sapi_apache2.c:1.83
--- php4/sapi/apache2filter/sapi_apache2.c:1.82 Wed Sep 18 17:57:31 2002
+++ php4/sapi/apache2filter/sapi_apache2.c Fri Sep 20 21:53:15 2002
@@ -502,7 +502,6 @@
sapi_startup(&apache2_sapi_module);
apache2_sapi_module.startup(&apache2_sapi_module);
apr_pool_cleanup_register(pconf, NULL, php_apache_server_shutdown,
apr_pool_cleanup_null);
- php_apache_register_module();
php_apache_add_version(pconf);
return OK;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /win32 php4ts_cli.rc
derick Fri Sep 20 16:15:24 2002 EDT Modified files: /php4/win32 php4ts_cli.rc Log: - Fix line-endings - Changed afxres.h to winres.h to make it compile when MFC is not installed (see http://www.winprog.org/tutorial/errors.html, "Fatal error RC1015: cannot open include file 'afxres.h'.") Index: php4/win32/php4ts_cli.rc diff -u php4/win32/php4ts_cli.rc:1.1 php4/win32/php4ts_cli.rc:1.2 --- php4/win32/php4ts_cli.rc:1.1Thu Apr 11 12:31:22 2002 +++ php4/win32/php4ts_cli.rcFri Sep 20 16:15:24 2002 @@ -1,63 +1,126 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -/ -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -/ -#undef APSTUDIO_READONLY_SYMBOLS - -/ -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -/ -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN -"resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN -"#include ""php4ts_cli.rc2""\r\n" -"\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN -"\r\n" -"\0" -END - -#endif// APSTUDIO_INVOKED - -#endif// English (U.S.) resources -/ - - - -#ifndef APSTUDIO_INVOKED -/ -// -// Generated from the TEXTINCLUDE 3 resource. -// -#include "php4ts_cli.rc2" - -/ -#endif// not APSTUDIO_INVOKED - +//Microsoft Developer Studio generated resource script. + +// + +#include "resource.h" + + + +#define APSTUDIO_READONLY_SYMBOLS + +/ + +// + +// Generated from the TEXTINCLUDE 2 resource. + +// + +#include "winres.h" + + + +/ + +#undef APSTUDIO_READONLY_SYMBOLS + + + +/ + +// English (U.S.) resources + + + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) + +#ifdef _WIN32 + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#pragma code_page(1252) + +#endif //_WIN32 + + + +#ifdef APSTUDIO_INVOKED + +/ + +// + +// TEXTINCLUDE + +// + + + +1 TEXTINCLUDE DISCARDABLE + +BEGIN + +"resource.h\0" + +END + + + +2 TEXTINCLUDE DISCARDABLE + +BEGIN + +"#include ""php4ts_cli.rc2""\r\n" + +"\0" + +END + + + +3 TEXTINCLUDE DISCARDABLE + +BEGIN + +"\r\n" + +"\0" + +END + + + +#endif// APSTUDIO_INVOKED + + + +#endif// English (U.S.) resources + +/ + + + + + + + +#ifndef APSTUDIO_INVOKED + +/ + +// + +// Generated from the TEXTINCLUDE 3 resource. + +// + +#include "php4ts_cli.rc2" + + + +/ + +#endif// not APSTUDIO_INVOKED + + + -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /win32 php4dllts.rc php4ts.rc
derick Fri Sep 20 16:13:56 2002 EDT Modified files: /php4/win32 php4ts.rc php4dllts.rc Log: - Fix line-endings - Changed afxres.h to winres.h to make it compile when MFC is not installed (see http://www.winprog.org/tutorial/errors.html, "Fatal error RC1015: cannot open include file 'afxres.h'.") Index: php4/win32/php4ts.rc diff -u php4/win32/php4ts.rc:1.1 php4/win32/php4ts.rc:1.2 --- php4/win32/php4ts.rc:1.1Thu Apr 11 12:31:22 2002 +++ php4/win32/php4ts.rcFri Sep 20 16:13:56 2002 @@ -1,63 +1,126 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -/ -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -/ -#undef APSTUDIO_READONLY_SYMBOLS - -/ -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -/ -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN -"resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN -"#include ""php4ts.rc2""\r\n" -"\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN -"\r\n" -"\0" -END - -#endif// APSTUDIO_INVOKED - -#endif// English (U.S.) resources -/ - - - -#ifndef APSTUDIO_INVOKED -/ -// -// Generated from the TEXTINCLUDE 3 resource. -// -#include "php4ts.rc2" - -/ -#endif// not APSTUDIO_INVOKED - +//Microsoft Developer Studio generated resource script. + +// + +#include "resource.h" + + + +#define APSTUDIO_READONLY_SYMBOLS + +/ + +// + +// Generated from the TEXTINCLUDE 2 resource. + +// + +#include "winres.h" + + + +/ + +#undef APSTUDIO_READONLY_SYMBOLS + + + +/ + +// English (U.S.) resources + + + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) + +#ifdef _WIN32 + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#pragma code_page(1252) + +#endif //_WIN32 + + + +#ifdef APSTUDIO_INVOKED + +/ + +// + +// TEXTINCLUDE + +// + + + +1 TEXTINCLUDE DISCARDABLE + +BEGIN + +"resource.h\0" + +END + + + +2 TEXTINCLUDE DISCARDABLE + +BEGIN + +"#include ""php4ts.rc2""\r\n" + +"\0" + +END + + + +3 TEXTINCLUDE DISCARDABLE + +BEGIN + +"\r\n" + +"\0" + +END + + + +#endif// APSTUDIO_INVOKED + + + +#endif// English (U.S.) resources + +/ + + + + + + + +#ifndef APSTUDIO_INVOKED + +/ + +// + +// Generated from the TEXTINCLUDE 3 resource. + +// + +#include "php4ts.rc2" + + + +/ + +#endif// not APSTUDIO_INVOKED + + + Index: php4/win32/php4dllts.rc diff -u php4/win32/php4dllts.rc:1.1 php4/win32/php4dllts.rc:1.2 --- php4/win32/php4dllts.rc:1.1 Thu Apr 11 12:31:21 2002 +++ php4/win32/php4dllts.rc Fri Sep 20 16:13:56 2002 @@ -1,63 +1,126 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -/ -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -/ -#undef APSTUDIO_READONLY_SYMBOLS - -/ -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -/ -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN -"resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN -"#include ""php4dllts.rc2""\r\n" -"\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN -"\r\n" -"\0" -END - -#endif// APSTUDIO_INVOKED - -#endif// English (U.S.) resources -//
[PHP-CVS] cvs: php4 /main main.c
sander Fri Sep 20 14:07:49 2002 EDT
Modified files:
/php4/main main.c
Log:
Changing the magic_quotes_gpc setting has no effect at USER level
# this partially fixes the #19526 shit
Index: php4/main/main.c
diff -u php4/main/main.c:1.488 php4/main/main.c:1.489
--- php4/main/main.c:1.488 Thu Sep 19 11:54:23 2002
+++ php4/main/main.cFri Sep 20 14:07:48 2002
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.488 2002/09/19 15:54:23 zeev Exp $ */
+/* $Id: main.c,v 1.489 2002/09/20 18:07:48 sander Exp $ */
/* {{{ includes
*/
@@ -258,7 +258,7 @@
STD_PHP_INI_BOOLEAN("ignore_repeated_errors", "0",PHP_INI_ALL,
OnUpdateBool, ignore_repeated_errors, php_core_globals,
core_globals)
STD_PHP_INI_BOOLEAN("ignore_repeated_source", "0",PHP_INI_ALL,
OnUpdateBool, ignore_repeated_source, php_core_globals,
core_globals)
STD_PHP_INI_BOOLEAN("report_memleaks", "1",
PHP_INI_SYSTEM, OnUpdateBool, report_memleaks,
php_core_globals, core_globals)
- STD_PHP_INI_BOOLEAN("magic_quotes_gpc", "1",PHP_INI_ALL,
OnUpdateBool, magic_quotes_gpc,
php_core_globals, core_globals)
+ STD_PHP_INI_BOOLEAN("magic_quotes_gpc", "1",
+PHP_INI_PERDIR|PHP_INI_SYSTEM,OnUpdateBool, magic_quotes_gpc,
+php_core_globals, core_globals)
STD_PHP_INI_BOOLEAN("magic_quotes_runtime", "0",PHP_INI_ALL,
OnUpdateBool, magic_quotes_runtime, php_core_globals,
core_globals)
STD_PHP_INI_BOOLEAN("magic_quotes_sybase", "0",PHP_INI_ALL,
OnUpdateBool, magic_quotes_sybase,php_core_globals,
core_globals)
STD_PHP_INI_ENTRY("output_buffering", "0",
PHP_INI_PERDIR|PHP_INI_SYSTEM,OnUpdateInt, output_buffering,
php_core_globals, core_globals)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/yaz config.m4
sniper Fri Sep 20 11:42:21 2002 EDT Modified files: /php4/ext/yaz config.m4 Log: fix typo Index: php4/ext/yaz/config.m4 diff -u php4/ext/yaz/config.m4:1.10 php4/ext/yaz/config.m4:1.11 --- php4/ext/yaz/config.m4:1.10 Thu Sep 19 22:46:37 2002 +++ php4/ext/yaz/config.m4 Fri Sep 20 11:42:20 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.10 2002/09/20 02:46:37 sniper Exp $ +dnl $Id: config.m4,v 1.11 2002/09/20 15:42:20 sniper Exp $ dnl PHP_ARG_WITH(yaz,for YAZ support, @@ -29,7 +29,7 @@ if test "$yaz_version" -ge 1009000; then AC_MSG_RESULT([$YAZVERSION]) else - AC_MSG_ERROR(YAZ version 1.9 or later required.]) + AC_MSG_ERROR([YAZ version 1.9 or later required.]) fi dir="" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php4 /ext/cyrus cyrus.c
martin Fri Sep 20 11:39:51 2002 EDT
Modified files:
/php4/ext/cyrus cyrus.c
Log:
Since the cyrus extension prints only one line, and no subsequent info,
it should have a similar appearance as the other one-liners.
Use php_info_print_table_row() instead of php_info_print_table_header(),
as in the other extensions.
Index: php4/ext/cyrus/cyrus.c
diff -u php4/ext/cyrus/cyrus.c:1.11 php4/ext/cyrus/cyrus.c:1.12
--- php4/ext/cyrus/cyrus.c:1.11 Wed Jun 26 03:24:47 2002
+++ php4/ext/cyrus/cyrus.c Fri Sep 20 11:39:50 2002
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: cyrus.c,v 1.11 2002/06/26 07:24:47 derick Exp $ */
+/* $Id: cyrus.c,v 1.12 2002/09/20 15:39:50 martin Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -102,7 +102,7 @@
PHP_MINFO_FUNCTION(cyrus)
{
php_info_print_table_start();
- php_info_print_table_header(2, "Cyrus IMAP support", "enabled");
+ php_info_print_table_row(2, "Cyrus IMAP support", "enabled");
php_info_print_table_end();
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: functable / table.php
hholzgraFri Sep 20 08:09:03 2002 EDT
Modified files:
/functable table.php
Log:
sql cosmetics
Index: functable/table.php
diff -u functable/table.php:1.13 functable/table.php:1.14
--- functable/table.php:1.13Fri Sep 20 07:40:53 2002
+++ functable/table.php Fri Sep 20 08:09:03 2002
@@ -86,7 +86,7 @@
# get languages, initialize translation counters
$translation = array();
- $result=mysql_query("select distinct language from quickref");
+ $result=mysql_query("SELECT DISTINCT language FROM quickref");
if(!$result) { echo mysql_error(); exit;}
while($row=mysql_fetch_array($result)) {
$translation[$row["language"]]=0;
@@ -374,7 +374,12 @@
mysql_free_result($result);
echo "getting function versions\n";
- $result = mysql_query("select function,version,versionid from funclist order
by function,versionid");
+ $result = mysql_query("SELECT function
+ , version
+ , versionid
+ FROM funclist
+ ORDER BY function, versionid
+");
if(!$result) { echo mysql_error(); }
while($row=mysql_fetch_array($result)) {
$entry[strtolower(trim($row["function"]))][$row["version"]]=true;
@@ -382,7 +387,12 @@
mysql_free_result($result);
echo "getting implementation files for PHP 3\n";
- $result = mysql_query("select function,filename,lineno from funclist where
versionid=399");
+ $result = mysql_query("SELECT function
+ , filename
+ , lineno
+ FROM funclist
+ WHERE versionid = 399
+");
if(!$result) { echo mysql_error(); }
while($row=mysql_fetch_array($result)) {
$file3[strtolower(trim($row["function"]))]=str_replace("php_3_cvs","php3","$row[filename]#$row[lineno]");
@@ -390,7 +400,12 @@
mysql_free_result($result);
echo "getting implementation files for php 4\n";
- $result = mysql_query("select function,filename,lineno from funclist where
versionid=499");
+ $result = mysql_query("SELECT function
+ , filename
+ , lineno
+ FROM funclist
+ WHERE versionid = 499
+");
if(!$result) { echo mysql_error(); exit; }
while($row=mysql_fetch_array($result)) {
$function = strtolower(trim($row["function"]));
@@ -399,14 +414,24 @@
}
mysql_free_result($result);
- $result = mysql_query("select function,file,lineno from funcimp where
versionid=499");
+ $result = mysql_query("SELECT function
+ , file
+ , lineno
+ FROM funcimp
+ WHERE versionid = 499
+");
while($row=mysql_fetch_array($result)) {
$imp4[strtolower(trim($row["function"]))]=str_replace("php_4_cvs","php4","$row[file]#$row[lineno]");
}
mysql_free_result($result);
echo "getting function docfiles\n";
- $result = mysql_query("select function,docfile,lineno from docfile where
docfile is not null");
+ $result = mysql_query("SELECT function
+ , docfile
+ , lineno
+ FROM docfile
+ WHERE docfile IS NOT NULL
+");
if(!$result) { echo mysql_error(); exit; }
while($row=mysql_fetch_array($result)) {
if(""!=trim($row["docfile"])) {
@@ -415,7 +440,11 @@
}
mysql_free_result($result);
- $result = mysql_query("select distinct function,proto,proto_desc from proto3");
+ $result = mysql_query("SELECT DISTINCT function
+ , proto
+ , proto_desc
+ FROM proto3
+");
if(!$result) { echo mysql_error(); exit; }
while($row=mysql_fetch_array($result)) {
$proto3[strtolower(trim($row["function"]))]=
@@ -423,7 +452,11 @@
}
mysql_free_result($result);
- $result = mysql_query("select distinct function,proto,proto_desc from proto4");
+ $result = mysql_query("SELECT DISTINCT function
+ , proto
+ , proto_desc
+ FROM proto4
+");
if(!$result) { echo mysql_error(); exit; }
while($row=mysql_fetch_array($result)) {
$proto4[strtolower(trim($row["function"]))]=
@@ -432,7 +465,11 @@
mysql_free_result($result);
[PHP-CVS] cvs: functable / dslgen xslgen /lib doc_versions.php
hholzgraFri Sep 20 07:55:43 2002 EDT
Added files:
/functable/lib doc_versions.php
Modified files:
/functable dslgen xslgen
Log:
merged common code
Index: functable/dslgen
diff -u functable/dslgen:1.11 functable/dslgen:1.12
--- functable/dslgen:1.11 Fri Sep 20 07:36:20 2002
+++ functable/dslgenFri Sep 20 07:55:43 2002
@@ -3,41 +3,9 @@
include "config.php";
- $min3 = array();
- $max3 = array();
- $min4 = array();
- $max4 = array();
- $func = array();
- $ver = array();
-
require_once "lib/dbconnect.php";
- $result = mysql_query("select distinct version,versionid from funclist");
- if(!$result) { echo mysql_error(); exit; }
- while ($row=mysql_fetch_array($result)) {
-
$ver[$row["versionid"]]=str_replace("_",".",str_replace("php_","",$row["version"]));
- }
- mysql_free_result($result);
-
-
- $result = mysql_query("select function,min(versionid) as min3,max(versionid)
as max3 from funclist where versionid <400 group by function");
- if(!$result) { echo mysql_error(); exit; }
- while ($row=mysql_fetch_array($result)) {
- $func[$row["function"]] = true;
- $min3[$row["function"]] = $row["min3"];
- $max3[$row["function"]] = $row["max3"];
- }
- mysql_free_result($result);
-
- $result = mysql_query("select function,min(versionid) as min4,max(versionid)
as max4 from funclist where versionid >=400 group by function");
- if(!$result) { echo mysql_error(); exit; }
- while ($row=mysql_fetch_array($result)) {
- $func[$row["function"]] = true;
- $min4[$row["function"]] = $row["min4"];
- $max4[$row["function"]] = $row["max4"];
- }
- mysql_free_result($result);
-
+ require_once "lib/doc_versions.php";
echo ";; DO NOT EDIT THIS FILE !!!\n";
echo ";; as it is auto-generated from the same database\n";
@@ -109,64 +77,27 @@
#f)))
";
+
echo "(define (version-info nl)\n";
echo " (cond\n";
- echo ' ((equal-ci? (data nl) "array") (literal "PHP 3, PHP 4 "))';
- echo ' ((equal-ci? (data nl) "echo") (literal "PHP 3, PHP 4 "))';
- echo ' ((equal-ci? (data nl) "empty") (literal "PHP 3, PHP 4 "))';
- echo ' ((equal-ci? (data nl) "eval") (literal "PHP 3, PHP 4 "))';
- echo ' ((equal-ci? (data nl) "exit") (literal "PHP 3, PHP 4 "))';
- echo ' ((equal-ci? (data nl) "isset") (literal "PHP 3, PHP 4 "))';
- echo ' ((equal-ci? (data nl) "list") (literal "PHP 3, PHP 4 "))';
- echo ' ((equal-ci? (data nl) "print") (literal "PHP 3, PHP 4 "))';
- echo ' ((equal-ci? (data nl) "unset") (literal "PHP 3, PHP 4 "))';
-
- foreach($func as $key => $dummy) {
- if(isset($min3[$key])) {
- $min = $min3[$key]-300;
- $max = $max3[$key]-300;
- $ver3="PHP 3";
- if($min==0) {
- if($max==99) { ; }
- else { $ver3.=" <= ".$ver[$max+300];}
- } else if($min==99){
- $ver3.=" CVS only";
- } else {
- if($max==99) { $ver3.=">= ".$ver[$min+300]; }
- else if ($min==$max) {$ver3.=$ver[$min+300]." only";}
- else { $ver3=$ver[$min+300]." - ".$ver[$max+300]." only";}
- }
- } else {
- $ver3 = "";
- }
- if(isset($min4[$key])) {
- $min = $min4[$key]-400;
- $max = $max4[$key]-400;
- $ver4="PHP 4 ";
- if($min==0) {
- if($max==99) { ; }
- else { $ver4.=" <= ".$ver[$max+400];}
- } else if($min==99){
- $ver4.=" CVS only";
- } else {
- if($max==99) { $ver4.=">= ".$ver[$min+400]; }
- else if ($min==$max) {$ver4.=$ver[$min+400]." only";}
- else { $ver4=$ver[$min+400]." - ".$ver[$max+400]." only";}
- }
- } else {
- $ver4 = "";
- }
-
- if(empty($ver3)||empty($ver4)) {
- $ver34 = "$ver3$ver4";
- } else {
- $ver34 = "$ver3, $ver4";
- }
-
- echo " ((equal-ci? (data nl) \"$key\") (literal \"$ver34\"))\n";
-}
-echo " (else (literal \"no version information, might be only in CVS\"))\n";
-echo " )\n";
-echo " )\n";
+ echo "
+ ((equal-ci? (data nl) 'array') (literal 'PHP 3, PHP 4 '))
+ ((equal-ci? (data nl) 'echo') (literal 'PHP 3, PHP 4 '))
+ ((equal-ci? (data nl) 'empty') (literal 'PHP 3, PHP 4 '))
+ ((equal-ci? (data nl) 'eval') (literal 'PHP 3, PHP 4 '))
+ ((equal-ci? (data nl) 'exit') (literal 'PHP 3, PHP 4 '))
+ ((equal-ci?
[PHP-CVS] cvs: php4 /ext/standard string.c
iliaa Fri Sep 20 07:48:48 2002 EDT
Modified files:
/php4/ext/standard string.c
Log:
Fixed bugs #12989 and #12120
Index: php4/ext/standard/string.c
diff -u php4/ext/standard/string.c:1.294 php4/ext/standard/string.c:1.295
--- php4/ext/standard/string.c:1.294Wed Sep 18 03:55:30 2002
+++ php4/ext/standard/string.c Fri Sep 20 07:48:47 2002
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.294 2002/09/18 07:55:30 hholzgra Exp $ */
+/* $Id: string.c,v 1.295 2002/09/20 11:48:47 iliaa Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -3324,7 +3324,7 @@
PHPAPI void php_strip_tags(char *rbuf, int len, int *stateptr, char *allow, int
allow_len)
{
char *tbuf, *buf, *p, *tp, *rp, c, lc;
- int br, i=0;
+ int br, i=0, depth=0;
int state = 0;
if (stateptr)
@@ -3353,6 +3353,8 @@
if(allow) {
*(tp++) = '<';
}
+ } else if (state) {
+ depth++;
}
break;
@@ -3383,6 +3385,11 @@
break;
case '>':
+ if (depth) {
+ depth--;
+ break;
+ }
+
if (state == 1) {
lc = '>';
state = 0;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: functable / table.php
hholzgraFri Sep 20 07:40:53 2002 EDT
Modified files:
/functable table.php
Log:
more whitespace stuff
Index: functable/table.php
diff -u functable/table.php:1.12 functable/table.php:1.13
--- functable/table.php:1.12Fri Sep 20 07:38:32 2002
+++ functable/table.php Fri Sep 20 07:40:53 2002
@@ -193,20 +193,20 @@
$alt = (($language=="yes")||empty($language))?"en":$language;
- switch($language)
- {
- case false: $docstr="documented"; break;
- case "yes": case "en": $docstr=""; break;
- default: $docstr=""; break;
- }
+ switch($language) {
+ case false: $docstr="documented"; break;
+ case "yes": case "en": $docstr=""; break;
+ default: $docstr=""; break;
+ }
- if(urlok($url))
+ if(urlok($url)) {
return " $docstr\n";
- else if($ext!="html")
+ } else if($ext!="html") {
return " $docstr\n";
- else
+ } else {
return " $docstr\n";
+ }
}
function author_ref($author) {
@@ -217,24 +217,23 @@
# {{{ functions for page setup
- function head($version=false,$letter=' ',$tpath="",$ttitle="",$versionid=false)
-{
- global $extensions,$color1,$color2,$imgdir,$ext,$translation,$bgcolor,$ol;
-
- if(isset($ttitle))
- echo strip_tags($ttitle)."\n";
- else
- echo "$letter\n";
-
- ob_start();
-
- $versionid=(empty($versionid)?"":".$versionid");
+ function head($version=false,$letter='
+',$tpath="",$ttitle="",$versionid=false) {
+ global
+$extensions,$color1,$color2,$imgdir,$ext,$translation,$bgcolor,$ol;
- $bgcolor=$color1;
-
- if(function_exists("custom_head")) {
- custom_head($ttitle,$tpath);
- } else {
+ if(isset($ttitle))
+ echo strip_tags($ttitle)."\n";
+ else
+ echo "$letter\n";
+
+ ob_start();
+
+ $versionid=(empty($versionid)?"":".$versionid");
+
+ $bgcolor=$color1;
+
+ if(function_exists("custom_head")) {
+ custom_head($ttitle,$tpath);
+ } else {
?>
@@ -401,21 +400,19 @@
mysql_free_result($result);
$result = mysql_query("select function,file,lineno from funcimp where
versionid=499");
- while($row=mysql_fetch_array($result))
-{
-
$imp4[strtolower(trim($row["function"]))]=str_replace("php_4_cvs","php4","$row[file]#$row[lineno]");
-}
+ while($row=mysql_fetch_array($result)) {
+
+$imp4[strtolower(trim($row["function"]))]=str_replace("php_4_cvs","php4","$row[file]#$row[lineno]");
+
+ }
mysql_free_result($result);
echo "getting function docfiles\n";
$result = mysql_query("select function,docfile,lineno from docfile where
docfile is not null");
if(!$result) { echo mysql_error(); exit; }
- while($row=mysql_fetch_array($result))
-{
- if(""!=trim($row["docfile"])) {
-$docfile[strtolower(trim($row["function"]))]="$row[docfile]#$row[lineno]";
- }
-}
+ while($row=mysql_fetch_array($result)) {
+ if(""!=trim($row["docfile"])) {
+
+$docfile[strtolower(trim($row["function"]))]="$row[docfile]#$row[lineno]";
+ }
+ }
mysql_free_result($result);
$result = mysql_query("select distinct function,proto,proto_desc from proto3");
@@ -437,19 +434,17 @@
echo "getting function quickrefs\n";
$result = mysql_query("select function,language,descr from quickref");
if(!$result) { echo mysql_error(); exit; }
- while($row=mysql_fetch_array($result))
-{
- $quickref[$row["language"]][strtolower(trim($row["function"]))]=$row["descr"];
-}
+ while($row=mysql_fetch_array($result)) {
+
+$quickref[$row["language"]][strtolower(trim($row["function"]))]=$row["descr"];
+ }
mysql_free_result($result);
echo "getting function authors\n";
$result = mysql_query("select function,author from author");
if(!$result) { echo mysql_error(); exit; }
- while($row=mysql_fetch_array($result))
-{
- $author[$row['function']] = $row['author'];
-}
+ while($row=mysql_fetch_array($result)) {
+ $author[$row['function']] = $row['author'];
+ }
mysql_free_result($result);
echo "checking for translations\n";
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.n
[PHP-CVS] cvs: functable / table.php
hholzgraFri Sep 20 07:38:33 2002 EDT
Modified files:
/functable table.php
Log:
each -> foreach
Index: functable/table.php
diff -u functable/table.php:1.11 functable/table.php:1.12
--- functable/table.php:1.11Fri Sep 20 07:36:20 2002
+++ functable/table.php Fri Sep 20 07:38:32 2002
@@ -7,11 +7,6 @@
// initial values ...
- $db_server="localhost";
- $db_user ="phpdoc";
- $db_passwd="phpdoc";
- $db_name ="phpdoc";
-
$outdir ="output";
$color1 = "white";
@@ -304,8 +299,8 @@
print(" \n");
print("");
$n=0;
-reset($version);
-while(list($versionid,$tag)=each($version)) {
+
+ foreach($version as $versionid => $tag) {
$n++;
if($versionid%100==99) { // Q&D PHP 4 versions start here
$n++;
@@ -318,8 +313,7 @@
print("function");
-reset($version);
-while(list($versionid,$tag)=each($version)) {
+ foreach($version as $versionid => $tag) {
if($id==3)
$ver =
ereg_replace("$","",ereg_replace("(.)","\\1",substr(strrchr($tag,"_"),1)));
else
@@ -459,8 +453,7 @@
mysql_free_result($result);
echo "checking for translations\n";
- reset($translation);
- while(list($language,)=each($translation)) {
+ foreach($translation as $language => $dummy) {
echo "... $language\n";
$result = mysql_query("SELECT q1.function AS function
FROM quickref q1
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: functable / dslgen table.php xslgen
hholzgraFri Sep 20 07:36:20 2002 EDT
Modified files:
/functable dslgen table.php xslgen
Log:
whitespace fixes
Index: functable/dslgen
diff -u functable/dslgen:1.10 functable/dslgen:1.11
--- functable/dslgen:1.10 Fri Sep 20 07:31:27 2002
+++ functable/dslgenFri Sep 20 07:36:20 2002
@@ -1,55 +1,55 @@
#!/usr/local/bin/php
=400 group by function");
-if(!$result) { echo mysql_error(); exit; }
-while ($row=mysql_fetch_array($result)) {
- $func[$row["function"]] = true;
- $min4[$row["function"]] = $row["min4"];
- $max4[$row["function"]] = $row["max4"];
-}
-mysql_free_result($result);
-
-
-echo ";; DO NOT EDIT THIS FILE !!!\n";
-echo ";; as it is auto-generated from the same database\n";
-echo ";; as the functiontable at \n";
-echo ";; http://www.zugeschaut-und-mitgebaut.de/php\n";;
-echo ";; you can generate it yourself by unsing the code\n";
-echo ";; to be found under the functable repository in CVS\n";
-echo ";;\n";
-echo ";; if you think this is out of date :\n";
-echo ";; mailto:[EMAIL PROTECTED]\n";;
-echo ";;\n\n";
-echo "(define (index-char-val ch)
+ $min3 = array();
+ $max3 = array();
+ $min4 = array();
+ $max4 = array();
+ $func = array();
+ $ver = array();
+
+ require_once "lib/dbconnect.php";
+
+ $result = mysql_query("select distinct version,versionid from funclist");
+ if(!$result) { echo mysql_error(); exit; }
+ while ($row=mysql_fetch_array($result)) {
+
+$ver[$row["versionid"]]=str_replace("_",".",str_replace("php_","",$row["version"]));
+ }
+ mysql_free_result($result);
+
+
+ $result = mysql_query("select function,min(versionid) as min3,max(versionid)
+as max3 from funclist where versionid <400 group by function");
+ if(!$result) { echo mysql_error(); exit; }
+ while ($row=mysql_fetch_array($result)) {
+ $func[$row["function"]] = true;
+ $min3[$row["function"]] = $row["min3"];
+ $max3[$row["function"]] = $row["max3"];
+ }
+ mysql_free_result($result);
+
+ $result = mysql_query("select function,min(versionid) as min4,max(versionid)
+as max4 from funclist where versionid >=400 group by function");
+ if(!$result) { echo mysql_error(); exit; }
+ while ($row=mysql_fetch_array($result)) {
+ $func[$row["function"]] = true;
+ $min4[$row["function"]] = $row["min4"];
+ $max4[$row["function"]] = $row["max4"];
+ }
+ mysql_free_result($result);
+
+
+ echo ";; DO NOT EDIT THIS FILE !!!\n";
+ echo ";; as it is auto-generated from the same database\n";
+ echo ";; as the functiontable at \n";
+ echo ";; http://www.zugeschaut-und-mitgebaut.de/php\n";;
+ echo ";; you can generate it yourself by unsing the code\n";
+ echo ";; to be found under the functable repository in CVS\n";
+ echo ";;\n";
+ echo ";; if you think this is out of date :\n";
+ echo ";; mailto:[EMAIL PROTECTED]\n";;
+ echo ";;\n\n";
+ echo "(define (index-char-val ch)
(case ch
((#\\A #\\a) 65)
((#\\B #\\b) 66)
@@ -109,22 +109,22 @@
#f)))
";
-echo "(define (version-info nl)\n";
-echo " (cond\n";
+ echo "(define (version-info nl)\n";
+ echo " (cond\n";
-echo ' ((equal-ci? (data nl) "array") (literal "PHP 3, PHP 4 "))';
-echo ' ((equal-ci? (data nl) "echo") (literal "PHP 3, PHP 4 "))';
-echo ' ((equal-ci? (data nl) "empty") (literal "PHP 3, PHP 4 "))';
-echo ' ((equal-ci? (data nl) "eval") (literal "PHP 3, PHP 4 "))';
-echo ' ((equal-ci? (data nl) "exit") (literal "PHP 3, PHP 4 "))';
-echo ' ((equal-ci? (data nl) "isset") (literal "PHP 3, PHP 4 "))';
-echo ' ((equal-ci? (data nl) "list") (literal "PHP 3, PHP 4 "))';
-echo ' ((equal-ci? (data nl) "print") (literal "PHP 3, PHP 4 "))';
-echo ' ((equal-ci? (data nl) "unset") (literal "PHP 3, PHP 4 "))';
-
-foreach($func as $key => $dummy) {
- if(isset($min3[$key])) {
- $min = $min3[$key]-300;
+ echo ' ((equal-ci? (data nl) "array") (literal "PHP 3, PHP 4 "))';
+ echo ' ((equal-ci? (data nl) "echo") (literal "PHP 3, PHP 4 "))';
+ echo ' ((equal-ci? (data nl) "empty") (literal "PHP 3, PHP 4 "))';
+ echo ' ((equal-ci? (data nl) "eval") (literal "PHP 3, PHP 4 "))';
+ echo ' ((equal-ci? (data nl) "exit") (literal "PHP 3, PHP 4 "))';
+ echo ' ((equal-ci? (data nl) "isset") (literal "PHP 3, PHP 4 "))';
+ echo ' ((equal-ci? (data nl) "list") (literal "PHP 3, PHP 4 "))';
+ echo ' ((equal-ci? (data nl) "print") (literal "PHP 3, PHP 4 "))';
+ echo ' ((equal-ci? (data nl) "unset") (literal "PHP 3, PHP 4 "))';
+
+ foreach($func as $key => $dummy) {
+ if(isset($min3[$key])) {
+ $min = $min3[$key]-300;
[PHP-CVS] cvs: functable / dslgen table.php xslgen /lib dbconnect.php
hholzgraFri Sep 20 07:31:28 2002 EDT
Added files:
/functable/lib dbconnect.php
Modified files:
/functable dslgen table.php xslgen
Log:
use central db connect
Index: functable/dslgen
diff -u functable/dslgen:1.9 functable/dslgen:1.10
--- functable/dslgen:1.9Fri Sep 20 07:16:23 2002
+++ functable/dslgenFri Sep 20 07:31:27 2002
@@ -10,9 +10,7 @@
$func = array();
$ver = array();
-$db = mysql_connect($dbhost, $dbuser, $dbpass);
-if(! $db) { echo mysql_error(); exit; }
-if(! mysql_select_db($dbname)) { echo mysq_error(); exit;}
+require_once "lib/dbconnect.php";
$result = mysql_query("select distinct version,versionid from funclist");
if(!$result) { echo mysql_error(); exit; }
Index: functable/table.php
diff -u functable/table.php:1.9 functable/table.php:1.10
--- functable/table.php:1.9 Tue May 28 07:46:54 2002
+++ functable/table.php Fri Sep 20 07:31:27 2002
@@ -2,6 +2,10 @@
= ".$ver[$min+400]; }
else if ($min==$max) {$ver4.=$ver[$min+400]." only";}
-else { $ver4=$ver[$min+400]." - ".$ver[$max+400]."
-only";}
+else { $ver4=$ver[$min+400]." - ".$ver[$max+400]." only";}
}
} else {
$ver4 = "";
Index: functable/lib/dbconnect.php
+++ functable/lib/dbconnect.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: functable / cvs-get-latest
hholzgraFri Sep 20 07:23:38 2002 EDT Removed files: /functable cvs-get-latest Log: this was never used anyway -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: functable / cvs-get-zend-latest cvs-get-zend-release
hholzgraFri Sep 20 07:22:37 2002 EDT Removed files: /functable cvs-get-zend-latest cvs-get-zend-release Log: no longer needed since CVS repository merge -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: functable / php3protos.awk php4protos.awk
hholzgraFri Sep 20 07:19:48 2002 EDT
Modified files:
/functable php3protos.awk php4protos.awk
Log:
nuke warnings produced by some awk versions
Index: functable/php3protos.awk
diff -u functable/php3protos.awk:1.1.1.1 functable/php3protos.awk:1.2
--- functable/php3protos.awk:1.1.1.1Tue Oct 10 13:34:32 2000
+++ functable/php3protos.awkFri Sep 20 07:19:47 2002
@@ -1,10 +1,10 @@
/^[[:space:]]*\/\*[[:space:]]*\{\{\{[[:space:]]*proto/ {
- split($0,proto,"proto[[:space:]]+|\*/[[:space:]]*$");
+ split($0,proto,"proto[[:space:]]+|\\*/[[:space:]]*$");
parse=1;
same=1;
lc=0;
}
-/\*\// {
+/\\*\// {
if(parse) {
lines="";
for(i=0;ihttp://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: functable / quickref
hholzgraFri Sep 20 07:18:58 2002 EDT Modified files: /functable quickref Log: 'bananasplit' name change Index: functable/quickref diff -u functable/quickref:1.3 functable/quickref:1.4 --- functable/quickref:1.3 Tue May 28 07:19:38 2002 +++ functable/quickref Fri Sep 20 07:18:58 2002 @@ -2,7 +2,7 @@ cd sources/phpdoc autoconf mysql -uphpdoc -pphpdoc -e "delete from quickref" phpdoc -for language in `for a in */functions ; do dirname $a; done` +for language in `for a in */reference ; do dirname $a; done` do echo " $language" if test $language = ja -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: functable / version4.tags
hholzgraFri Sep 20 07:18:22 2002 EDT Modified files: /functable version4.tags Log: new 4.x releases added Index: functable/version4.tags diff -u functable/version4.tags:1.11 functable/version4.tags:1.12 --- functable/version4.tags:1.11Tue May 28 02:08:25 2002 +++ functable/version4.tags Fri Sep 20 07:18:22 2002 @@ -10,3 +10,5 @@ php_4_1_2 php_4_2_0 php_4_2_1 +php_4_2_2 +php_4_2_3 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: functable / dslgen xslgen
hholzgraFri Sep 20 07:16:23 2002 EDT
Modified files:
/functable dslgen xslgen
Log:
use config.php, foreach instead of reset/each ...
Index: functable/dslgen
diff -u functable/dslgen:1.8 functable/dslgen:1.9
--- functable/dslgen:1.8Fri Sep 20 04:57:41 2002
+++ functable/dslgenFri Sep 20 07:16:23 2002
@@ -1,6 +1,7 @@
#!/usr/local/bin/php
$dummy) {
if(isset($min3[$key])) {
$min = $min3[$key]-300;
$max = $max3[$key]-300;
Index: functable/xslgen
diff -u functable/xslgen:1.5 functable/xslgen:1.6
--- functable/xslgen:1.5Fri Sep 20 04:57:41 2002
+++ functable/xslgenFri Sep 20 07:16:23 2002
@@ -1,6 +1,6 @@
#!/usr/local/bin/php -q
\n";
echo "
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
";
-reset($func);
-while(list($key,)=each($func)) {
+foreach($func as $key => $dummy) {
if(isset($min3[$key])) {
$min = $min3[$key]-300;
$max = $max3[$key]-300;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: functable / config.php
hholzgraFri Sep 20 07:08:01 2002 EDT Added files: /functable config.php Log: start of code cleanup Index: functable/config.php +++ functable/config.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: functable / dslgen xslgen
hholzgraFri Sep 20 04:57:41 2002 EDT
Modified files:
/functable dslgen xslgen
Log:
internal functions added to generated dsssl and xml version info
Index: functable/dslgen
diff -u functable/dslgen:1.7 functable/dslgen:1.8
--- functable/dslgen:1.7Thu Sep 12 04:43:35 2002
+++ functable/dslgenFri Sep 20 04:57:41 2002
@@ -113,6 +113,17 @@
";
echo "(define (version-info nl)\n";
echo " (cond\n";
+
+echo ' ((equal-ci? (data nl) "array") (literal "PHP 3, PHP 4 "))';
+echo ' ((equal-ci? (data nl) "echo") (literal "PHP 3, PHP 4 "))';
+echo ' ((equal-ci? (data nl) "empty") (literal "PHP 3, PHP 4 "))';
+echo ' ((equal-ci? (data nl) "eval") (literal "PHP 3, PHP 4 "))';
+echo ' ((equal-ci? (data nl) "exit") (literal "PHP 3, PHP 4 "))';
+echo ' ((equal-ci? (data nl) "isset") (literal "PHP 3, PHP 4 "))';
+echo ' ((equal-ci? (data nl) "list") (literal "PHP 3, PHP 4 "))';
+echo ' ((equal-ci? (data nl) "print") (literal "PHP 3, PHP 4 "))';
+echo ' ((equal-ci? (data nl) "unset") (literal "PHP 3, PHP 4 "))';
+
reset($func);
while(list($key,)=each($func)) {
if(isset($min3[$key])) {
Index: functable/xslgen
diff -u functable/xslgen:1.4 functable/xslgen:1.5
--- functable/xslgen:1.4Tue May 28 07:18:41 2002
+++ functable/xslgenFri Sep 20 04:57:41 2002
@@ -55,6 +55,19 @@
echo ";; -->\n\n";
echo "\n";
+
+echo "
+
+
+
+
+
+
+
+
+
+";
+
reset($func);
while(list($key,)=each($func)) {
if(isset($min3[$key])) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
