[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Sun Jan 25 20:33:21 2004 EDT Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.1518r2=1.1519ty=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.1518 php-src/ChangeLog:1.1519 --- php-src/ChangeLog:1.1518Sat Jan 24 20:32:19 2004 +++ php-src/ChangeLog Sun Jan 25 20:33:17 2004 @@ -1,3 +1,148 @@ +2004-01-25 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_4_3) + NEWS: + bug fixing news. + +* (PHP_4_3) + Zend/zend_execute.c: + MFH: Fixed bug #26814 (On parse error include included file, terminate + execution script). + +* ZendEngine2/zend_execute.c: + Fixed bug #26814 (On parse error include included file, terminate + execution script). + +2004-01-25 Pierre-Alain Joye [EMAIL PROTECTED] + +* pear/PEAR.php: + - Use is_a + +* pear/package.dtd: + WS + +* (PHP_4_3) + pear/package.dtd: + - 2004 (c) + +* (PHP_4_3) + pear/CMD.php + pear/PEAR.php + pear/System.php + pear/PEAR/Autoloader.php + pear/PEAR/Builder.php + pear/PEAR/Command.php + pear/PEAR/Config.php + pear/PEAR/Dependency.php + pear/PEAR/Downloader.php + pear/PEAR/Installer.php + pear/PEAR/Packager.php + pear/PEAR/Registry.php + pear/PEAR/Command/Auth.php + pear/PEAR/Command/Build.php + pear/PEAR/Command/Common.php + pear/PEAR/Command/Config.php + pear/PEAR/Command/Install.php + pear/PEAR/Command/Mirror.php + pear/PEAR/Command/Package.php + pear/PEAR/Command/Remote.php + pear/PEAR/Frontend/CLI.php + pear/scripts/pear.bat + pear/scripts/pearcmd.php + pear/scripts/pearwin.php: + - year++; + +* pear/packages/DB-1.6.0RC1.tar + pear/packages/HTTP-1.2.2.tar + pear/packages/Mail-1.1.2.tar: + - Update Mail, HTTP and DB. Adding new archives + +* pear/packages/DB-1.5.0RC1.tar + pear/packages/HTTP-1.2.1.tar + pear/packages/Mail-1.1.0.tar: + - Update HTTP, DB and Mail packages + +* pear/packages/Mail-1.1.2.tar + pear/packages/Mail-1.1.2.tar: + + file Mail-1.1.2.tar was initially added on branch PHP_4_3. + +* pear/packages/DB-1.6.0RC1.tar + pear/packages/DB-1.6.0RC1.tar + pear/packages/HTTP-1.2.2.tar + pear/packages/HTTP-1.2.2.tar: + + file DB-1.6.0RC1.tar was initially added on branch PHP_4_3. + +* (PHP_4_3) + pear/packages/DB-1.5.0RC2.tar + pear/packages/HTTP-1.2.1.tar + pear/packages/Mail-1.1.1.tar: + - Prepare 4.3.5, remove old archives + +2004-01-25 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_4_3) + NEWS: + sybase_ct extension fixes and improvements by Timm Friebe. + +2004-01-25 Timm Friebe [EMAIL PROTECTED] + +* ext/sybase_ct/php_sybase_ct.c + ext/sybase_ct/php_sybase_ct.h: + + +2004-01-25 Ard Biesheuvel [EMAIL PROTECTED] + +* php.ini-dist + php.ini-recommended: + MySQL is no longer built in by default + +* ext/standard/url.c: + CS + +2004-01-25 Andrey Hristov [EMAIL PROTECTED] + +* NEWS: + entrt about feature request #24258 + +2004-01-25 Marcus Boerger [EMAIL PROTECTED] + +* NEWS + NEWS: + BFN + +* ZendEngine2/zend_execute.c + ZendEngine2/zend_iterators.c + ZendEngine2/zend_iterators.h: + Respect proeprty visibility in foreach + +* ZendEngine2/tests/bug26696.phpt: + Update test + +2004-01-25 Ard Biesheuvel [EMAIL PROTECTED] + +* ext/interbase/config.w32: + Check for both Firebird 1+ and Interbase/FB1 + +2004-01-25 Georg Richter [EMAIL PROTECTED] + +* ext/mysqli/mysqli_api.c: + prototype fix for mysqli_fetch + +2004-01-25 Jani Taskinen [EMAIL PROTECTED] + +* ext/standard/file.c: + Fixed bug #27020 (Compile failure; sys/select.h: No such file or directory) + +2004-01-25 Ard Biesheuvel [EMAIL PROTECTED] + +* ext/standard/ftp_fopen_wrapper.c + ext/standard/url.c + ext/standard/url.h: + Changed prototypes to allow parsing of string literals and constant strings + Minor CS/WS + 2004-01-24 Marcus Boerger [EMAIL PROTECTED] * ZendEngine2/zend_API.c
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Sun Jan 25 20:33:25 2004 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.393r2=1.394ty=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.393 ZendEngine2/ChangeLog:1.394 --- ZendEngine2/ChangeLog:1.393 Sat Jan 24 20:32:26 2004 +++ ZendEngine2/ChangeLog Sun Jan 25 20:33:25 2004 @@ -1,3 +1,19 @@ +2004-01-25 Ilia Alshanetsky [EMAIL PROTECTED] + +* zend_execute.c: + Fixed bug #26814 (On parse error include included file, terminate + execution script). + +2004-01-25 Marcus Boerger [EMAIL PROTECTED] + +* zend_execute.c + zend_iterators.c + zend_iterators.h: + Respect proeprty visibility in foreach + +* tests/bug26696.phpt: + Update test + 2004-01-24 Marcus Boerger [EMAIL PROTECTED] * zend_API.c @@ -2974,7 +2990,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.393 2004/01/25 01:32:26 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.394 2004/01/26 01:33:25 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -4698,7 +4714,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.393 2004/01/25 01:32:26 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.394 2004/01/26 01:33:25 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src / NEWS
helly Sun Jan 25 06:54:29 2004 EDT Modified files: /php-srcNEWS Log: BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1586r2=1.1587ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1586 php-src/NEWS:1.1587 --- php-src/NEWS:1.1586 Wed Jan 21 11:57:12 2004 +++ php-src/NEWSSun Jan 25 06:54:28 2004 @@ -1,6 +1,7 @@ PHPNEWS ||| ?? ??? 2004, PHP 5 RC1 +- Completely overhauled SimpleXML extension. (Marcus, Rob, Sterling) - Added stream_lock() method to userspace streams interface. (Hartmut, Wez) - Added xsltprocessor-registerPHPFunctions(). (Christian) - Bundled new SPL extension. (Marcus, Derick) @@ -9,6 +10,7 @@ (Derick) - Fixed problems with longlong values in mysqli. (Georg) - Fixed class name case preserving of user defined classes. (Marcus) +- Fixed bug #27008 (Every class method can be called as static). (Marcus) - Fixed bug #26938 (exec() has problems reading long lines). (Ilia, runekl[at]opoint[dot]com - Fixed bug #26947 (ext/dom: Crash when using DomDocument::getElementById()). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli mysqli_api.c
georg Sun Jan 25 07:01:37 2004 EDT
Modified files:
/php-src/ext/mysqli mysqli_api.c
Log:
prototype fix for mysqli_fetch
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.60r2=1.61ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.60 php-src/ext/mysqli/mysqli_api.c:1.61
--- php-src/ext/mysqli/mysqli_api.c:1.60Sat Jan 24 09:38:16 2004
+++ php-src/ext/mysqli/mysqli_api.c Sun Jan 25 07:01:36 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_api.c,v 1.60 2004/01/24 14:38:16 georg Exp $
+ $Id: mysqli_api.c,v 1.61 2004/01/25 12:01:36 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -628,7 +628,7 @@
}
/* }}} */
-/* {{{ proto int mysqli_fetch(object stmt)
+/* {{{ proto mixed mysqli_fetch(object stmt)
Fetch results from a prepared statement into the bound variables */
PHP_FUNCTION(mysqli_fetch)
{
@@ -670,7 +670,7 @@
if (lval != (long)lval) {
/* even though lval is
declared as unsigned, the value
* may be negative.
Therefor we cannot use %llu and must
-* user %lld.
+* use %lld.
*/
sprintf((char *)tmp,
%lld, lval);
ZVAL_STRING(stmt-result.vars[i], tmp, 1);
@@ -695,7 +695,17 @@
MYSQLI_REPORT_STMT_ERROR(stmt-stmt);
}
- RETURN_LONG(ret);
+ switch (ret) {
+ case 0:
+ RETURN_TRUE;
+ break;
+ case 1:
+ RETURN_FALSE;
+ break;
+ default:
+ RETURN_LONG(ret);
+ break;
+ }
}
/* }}} */
@@ -861,7 +871,7 @@
}
/* }}} */
-/* {{{ proto int mysqli_field_seek(object link, int fieldnr)
+/* {{{ proto int mysqli_field_seek(object result, int fieldnr)
Set result pointer to a specified field offset
*/
PHP_FUNCTION(mysqli_field_seek)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/interbase config.w32
abies Sun Jan 25 07:03:25 2004 EDT
Modified files:
/php-src/ext/interbase config.w32
Log:
Check for both Firebird 1+ and Interbase/FB1
http://cvs.php.net/diff.php/php-src/ext/interbase/config.w32?r1=1.1r2=1.2ty=u
Index: php-src/ext/interbase/config.w32
diff -u php-src/ext/interbase/config.w32:1.1 php-src/ext/interbase/config.w32:1.2
--- php-src/ext/interbase/config.w32:1.1Fri Dec 19 10:04:20 2003
+++ php-src/ext/interbase/config.w32Sun Jan 25 07:03:24 2004
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.1 2003/12/19 15:04:20 wez Exp $
+// $Id: config.w32,v 1.2 2004/01/25 12:03:24 abies Exp $
// vim:ft=javascript
ARG_WITH(interbase, InterBase support, no);
@@ -6,12 +6,11 @@
if (PHP_INTERBASE != no) {
if (CHECK_HEADER_ADD_INCLUDE(ibase.h, CFLAGS_INTERBASE, PHP_PHP_BUILD +
\\interbase\\include; + PHP_INTERBASE)
- CHECK_LIB(ib_util_ms.lib, interbase, PHP_PHP_BUILD +
\\interbase\\lib_ms; + PHP_INTERBASE)
- CHECK_LIB(gds32_ms.lib, interbase, PHP_PHP_BUILD +
\\interbase\\lib_ms; + PHP_INTERBASE)) {
+ (CHECK_LIB(fbclient_ms.lib, interbase, PHP_PHP_BUILD +
\\interbase\\lib_ms; + PHP_INTERBASE) ||
+CHECK_LIB(gds32_ms.lib, interbase, PHP_PHP_BUILD +
\\interbase\\lib_ms; + PHP_INTERBASE))) {
EXTENSION(interbase, interbase.c);
AC_DEFINE('HAVE_IBASE', 1, 'Have interbase library');
} else {
WARNING(interbase not enabled; libraries and headers not found);
}
}
-
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl/examples findfile.inc findfile.php findregex.php
helly Sun Jan 25 08:03:26 2004 EDT
Added files:
/php-src/ext/spl/examples findfile.inc findregex.php
Modified files:
/php-src/ext/spl/examples findfile.php
Log:
Update examples
http://cvs.php.net/diff.php/php-src/ext/spl/examples/findfile.php?r1=1.4r2=1.5ty=u
Index: php-src/ext/spl/examples/findfile.php
diff -u php-src/ext/spl/examples/findfile.php:1.4
php-src/ext/spl/examples/findfile.php:1.5
--- php-src/ext/spl/examples/findfile.php:1.4 Fri Jan 23 17:33:45 2004
+++ php-src/ext/spl/examples/findfile.php Sun Jan 25 08:03:24 2004
@@ -24,18 +24,5 @@
exit(1);
}
-class FindFile extends FilterIterator
-{
- protected $file;
-
- function __construct($path, $file) {
- $this-file = $file;
- parent::__construct(new RecursiveIteratorIterator(new
RecursiveDirectoryIterator($path)));
- }
- function accept() {
- return !strcmp($this-current(), $this-file);
- }
-}
-
-foreach(new FindFile($argv[1], $argv[2]) as $pathname = $file) echo
$file-getPathname().\n;
+foreach(new FindFile($argv[1], $argv[2]) as $file) echo $file-getPathname().\n;
?
\ No newline at end of file
http://cvs.php.net/co.php/php-src/ext/spl/examples/findfile.inc?r=1.1p=1
Index: php-src/ext/spl/examples/findfile.inc
+++ php-src/ext/spl/examples/findfile.inc
?php
/**
* @brief Base class to find files
* @author Marcus Boerger
* @version 1.0
*
*/
class FindFile extends FilterIterator
{
protected $file;
function __construct($path, $file)
{
$this-file = $file;
parent::__construct(new RecursiveIteratorIterator(new
RecursiveDirectoryIterator($path)));
}
function accept()
{
return !strcmp($this-current(), $this-file);
}
}
?
http://cvs.php.net/co.php/php-src/ext/spl/examples/findregex.php?r=1.1p=1
Index: php-src/ext/spl/examples/findregex.php
+++ php-src/ext/spl/examples/findregex.php
?php
/** Find a specific file by name.
*
* Usage: php findregex.php path name
*
* path Path to search in.
* name Filename to look for.
*
* (c) Marcus Boerger, Adam Trachtenberg, 2004
*/
if ($argc 3) {
echo EOF
Usage: php findregex.php file name
Find a specific file by name.
path Path to search in.
name Regex for filenames to look for.
EOF;
exit(1);
}
class RegexFindFile extends FindFile
{
function accept()
{
return preg_match($this-file, $this-current());
}
}
foreach(new RegexFindFile($argv[1], $argv[2]) as $file) {
echo $file-getPathname().\n;
}
?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
helly Sun Jan 25 08:33:44 2004 EDT Modified files: /php-srcNEWS Log: BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1587r2=1.1588ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1587 php-src/NEWS:1.1588 --- php-src/NEWS:1.1587 Sun Jan 25 06:54:28 2004 +++ php-src/NEWSSun Jan 25 08:33:43 2004 @@ -1,6 +1,7 @@ PHPNEWS ||| ?? ??? 2004, PHP 5 RC1 +- Respect property visibility in foreach. (Marcus) - Completely overhauled SimpleXML extension. (Marcus, Rob, Sterling) - Added stream_lock() method to userspace streams interface. (Hartmut, Wez) - Added xsltprocessor-registerPHPFunctions(). (Christian) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
andrey Sun Jan 25 09:01:00 2004 EDT Modified files: /php-srcNEWS Log: entrt about feature request #24258 http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1588r2=1.1589ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1588 php-src/NEWS:1.1589 --- php-src/NEWS:1.1588 Sun Jan 25 08:33:43 2004 +++ php-src/NEWSSun Jan 25 09:00:59 2004 @@ -53,6 +53,8 @@ - Fixed bug #24608 (__set not triggered when overloading with array). (Stanislav) - Fixed bug #24243 (enabling browscap causes segfault). (Wez) +- Added third optional parameter 'strict' to array_keys(). Works like the + 'strict' parameter of in_array(). Feature request #24258. (Andrey) 21 Dec 2003, PHP 5 Beta 3 - Bundled new tidy extension (John, Wez) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard url.c
abies Sun Jan 25 10:08:33 2004 EDT
Modified files:
/php-src/ext/standard url.c
Log:
CS
http://cvs.php.net/diff.php/php-src/ext/standard/url.c?r1=1.76r2=1.77ty=u
Index: php-src/ext/standard/url.c
diff -u php-src/ext/standard/url.c:1.76 php-src/ext/standard/url.c:1.77
--- php-src/ext/standard/url.c:1.76 Sat Jan 24 19:30:49 2004
+++ php-src/ext/standard/url.c Sun Jan 25 10:08:31 2004
@@ -15,7 +15,7 @@
| Author: Jim Winstead [EMAIL PROTECTED] |
+--+
*/
-/* $Id: url.c,v 1.76 2004/01/25 00:30:49 abies Exp $ */
+/* $Id: url.c,v 1.77 2004/01/25 15:08:31 abies Exp $ */
#include stdlib.h
#include string.h
@@ -462,8 +462,8 @@
if (*data == '+') {
*dest = ' ';
}
- else if (*data == '%' len = 2 isxdigit((int) *(data + 1))
isxdigit((int) *(data + 2)))
- {
+ else if (*data == '%' len = 2 isxdigit((int) *(data + 1))
+ isxdigit((int) *(data + 2))) {
#ifndef CHARSET_EBCDIC
*dest = (char) php_htoi(data + 1);
#else
@@ -560,8 +560,8 @@
char *data = str;
while (len--) {
- if (*data == '%' len = 2 isxdigit((int) *(data + 1))
isxdigit((int) *(data + 2)))
- {
+ if (*data == '%' len = 2 isxdigit((int) *(data + 1))
+isxdigit((int) *(data + 2))) {
#ifndef CHARSET_EBCDIC
*dest = (char) php_htoi(data + 1);
#else
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended
abies Sun Jan 25 10:18:03 2004 EDT Modified files: /php-srcphp.ini-dist php.ini-recommended Log: MySQL is no longer built in by default http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.203r2=1.204ty=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.203 php-src/php.ini-dist:1.204 --- php-src/php.ini-dist:1.203 Wed Dec 17 21:06:00 2003 +++ php-src/php.ini-distSun Jan 25 10:18:02 2004 @@ -531,7 +531,7 @@ ;Windows Extensions -;Note that MySQL and ODBC support is now built in, so no dll is needed for it. +;Note that ODBC support is now built in, so no dll is needed for it. ; ;extension=php_bz2.dll ;extension=php_cpdf.dll http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.148r2=1.149ty=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.148 php-src/php.ini-recommended:1.149 --- php-src/php.ini-recommended:1.148 Wed Dec 17 21:06:00 2003 +++ php-src/php.ini-recommended Sun Jan 25 10:18:02 2004 @@ -550,7 +550,7 @@ ;Windows Extensions -;Note that MySQL and ODBC support is now built in, so no dll is needed for it. +;Note that ODBC support is now built in, so no dll is needed for it. ; ;extension=php_bz2.dll ;extension=php_cpdf.dll -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl php_spl.c spl_functions.c spl_functions.h
helly Sun Jan 25 12:30:20 2004 EDT
Modified files:
/php-src/ext/splphp_spl.c spl_functions.c spl_functions.h
Log:
Show supported classes interfaces in -i and phpinfo()
http://cvs.php.net/diff.php/php-src/ext/spl/php_spl.c?r1=1.26r2=1.27ty=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.26 php-src/ext/spl/php_spl.c:1.27
--- php-src/ext/spl/php_spl.c:1.26 Tue Jan 20 15:59:45 2004
+++ php-src/ext/spl/php_spl.c Sun Jan 25 12:30:19 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_spl.c,v 1.26 2004/01/20 20:59:45 helly Exp $ */
+/* $Id: php_spl.c,v 1.27 2004/01/25 17:30:19 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -120,16 +120,6 @@
}
/* }}} */
-/* {{{ PHP_MINFO(spl)
- */
-PHP_MINFO_FUNCTION(spl)
-{
- php_info_print_table_start();
- php_info_print_table_header(2, SPL support,enabled);
- php_info_print_table_end();
-}
-/* }}} */
-
/* {{{ class_parents
*/
PHP_FUNCTION(class_parents)
@@ -143,7 +133,7 @@
array_init(return_value);
parent_class = Z_OBJCE_P(obj)-parent;
while (parent_class) {
- spl_add_class_name(return_value, parent_class TSRMLS_CC);
+ spl_add_class_name(return_value, parent_class, 0, 0 TSRMLS_CC);
parent_class = parent_class-parent;
}
}
@@ -159,33 +149,76 @@
RETURN_FALSE;
}
array_init(return_value);
- spl_add_interfaces(return_value, Z_OBJCE_P(obj) TSRMLS_CC);
+ spl_add_interfaces(return_value, Z_OBJCE_P(obj), 1, ZEND_ACC_INTERFACE
TSRMLS_CC);
}
/* }}} */
-#define SPL_ADD_CLASS(class_name) \
- spl_add_classes(spl_ce_ ## class_name, return_value TSRMLS_CC)
+#define SPL_ADD_CLASS(class_name, z_list, sub, allow, ce_flags) \
+ spl_add_classes(spl_ce_ ## class_name, z_list, sub, allow, ce_flags TSRMLS_CC)
+
+#define SPL_LIST_CLASSES(z_list, sub, allow, ce_flags) \
+ SPL_ADD_CLASS(ArrayObject, z_list, sub, allow, ce_flags); \
+ SPL_ADD_CLASS(ArrayIterator, z_list, sub, allow, ce_flags); \
+ SPL_ADD_CLASS(CachingIterator, z_list, sub, allow, ce_flags); \
+ SPL_ADD_CLASS(CachingRecursiveIterator, z_list, sub, allow, ce_flags); \
+ SPL_ADD_CLASS(DirectoryIterator, z_list, sub, allow, ce_flags); \
+ SPL_ADD_CLASS(FilterIterator, z_list, sub, allow, ce_flags); \
+ SPL_ADD_CLASS(LimitIterator, z_list, sub, allow, ce_flags); \
+ SPL_ADD_CLASS(ParentIterator, z_list, sub, allow, ce_flags); \
+ SPL_ADD_CLASS(RecursiveDirectoryIterator, z_list, sub, allow, ce_flags); \
+ SPL_ADD_CLASS(RecursiveIterator, z_list, sub, allow, ce_flags); \
+ SPL_ADD_CLASS(RecursiveIteratorIterator, z_list, sub, allow, ce_flags); \
+ SPL_ADD_CLASS(SeekableIterator, z_list, sub, allow, ce_flags); \
+ SPL_ADD_CLASS(SimpleXMLIterator, z_list, sub, allow, ce_flags); \
/* {{{ spl_classes */
PHP_FUNCTION(spl_classes)
{
array_init(return_value);
+
+ SPL_LIST_CLASSES(return_value, 0, 0, 0)
+}
+/* }}} */
- SPL_ADD_CLASS(ArrayObject);
- SPL_ADD_CLASS(ArrayIterator);
- SPL_ADD_CLASS(CachingIterator);
- SPL_ADD_CLASS(CachingRecursiveIterator);
- SPL_ADD_CLASS(DirectoryIterator);
- SPL_ADD_CLASS(FilterIterator);
- SPL_ADD_CLASS(LimitIterator);
- SPL_ADD_CLASS(ParentIterator);
- SPL_ADD_CLASS(RecursiveDirectoryIterator);
- SPL_ADD_CLASS(RecursiveIterator);
- SPL_ADD_CLASS(RecursiveIteratorIterator);
- SPL_ADD_CLASS(SeekableIterator);
- if (spl_ce_SimpleXMLIterator) {
- SPL_ADD_CLASS(SimpleXMLIterator);
- }
+int spl_build_class_list_string(zval **entry, char **list TSRMLS_DC)
+{
+ char *res;
+
+ spprintf(res, 0, %s, %s, *list, Z_STRVAL_PP(entry));
+ efree(*list);
+ *list = res;
+ return ZEND_HASH_APPLY_KEEP;
+}
+
+/* {{{ PHP_MINFO(spl)
+ */
+PHP_MINFO_FUNCTION(spl)
+{
+ zval list;
+ char *strg;
+
+ php_info_print_table_start();
+ php_info_print_table_header(2, SPL support,enabled);
+
+ INIT_PZVAL(list);
+ array_init(list);
+ SPL_LIST_CLASSES(list, 0, 1, ZEND_ACC_INTERFACE)
+ strg = estrdup();
+ zend_hash_apply_with_argument(Z_ARRVAL_P(list),
(apply_func_arg_t)spl_build_class_list_string, strg TSRMLS_CC);
+ zval_dtor(list);
+ php_info_print_table_row(2, Interfaces, strg + 2);
+ efree(strg);
+
+ INIT_PZVAL(list);
+ array_init(list);
+ SPL_LIST_CLASSES(list, 0, -1, ZEND_ACC_INTERFACE)
+ strg = estrdup();
+ zend_hash_apply_with_argument(Z_ARRVAL_P(list),
(apply_func_arg_t)spl_build_class_list_string, strg TSRMLS_CC);
+ zval_dtor(list);
+ php_info_print_table_row(2, Classes, strg + 2);
+ efree(strg);
+
+ php_info_print_table_end();
}
/* }}} */
[PHP-CVS] cvs: CVSROOT / avail
derick Sun Jan 25 15:03:10 2004 EDT Modified files: /CVSROOTavail Log: - Give myself access to PECL web to fix some typoes http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.815r2=1.816ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.815 CVSROOT/avail:1.816 --- CVSROOT/avail:1.815 Wed Jan 21 06:03:31 2004 +++ CVSROOT/avail Sun Jan 25 15:03:08 2004 @@ -59,7 +59,7 @@ avail|elf|phpdoc/ja # access to the newly cut pecl website etc -avail|pajoye,wez,pollita,tal,cox,mj,helly,john,iliaa,edink,jan|peclweb,pecl +avail|pajoye,wez,pollita,tal,cox,mj,helly,john,iliaa,edink,jan,derick|peclweb,pecl # General pecl avail|csilles,t2k269|pecl -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sybase_ct php_sybase_ct.c php_sybase_ct.h
thekid Sun Jan 25 15:03:11 2004 EDT
Modified files:
/php-src/ext/sybase_ct php_sybase_ct.c php_sybase_ct.h
Log:
@- Added ability to define a message handler not only globally, but also
@ per connection (Timm)
@- Made sybct.login_timeout changeable at runtime (Timm)
@- Added ini option sybct.packet_size which lets you control the packet
@ size (Timm)
http://cvs.php.net/diff.php/php-src/ext/sybase_ct/php_sybase_ct.c?r1=1.89r2=1.90ty=u
Index: php-src/ext/sybase_ct/php_sybase_ct.c
diff -u php-src/ext/sybase_ct/php_sybase_ct.c:1.89
php-src/ext/sybase_ct/php_sybase_ct.c:1.90
--- php-src/ext/sybase_ct/php_sybase_ct.c:1.89 Fri Jan 23 21:17:42 2004
+++ php-src/ext/sybase_ct/php_sybase_ct.c Sun Jan 25 15:03:10 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_sybase_ct.c,v 1.89 2004/01/24 02:17:42 thekid Exp $ */
+/* $Id: php_sybase_ct.c,v 1.90 2004/01/25 20:03:10 thekid Exp $ */
#ifdef HAVE_CONFIG_H
@@ -38,53 +38,54 @@
#if HAVE_SYBASE_CT
function_entry sybase_functions[] = {
- PHP_FE(sybase_connect, NULL)
- PHP_FE(sybase_pconnect, NULL)
- PHP_FE(sybase_close,NULL)
- PHP_FE(sybase_select_db,NULL)
- PHP_FE(sybase_query,NULL)
- PHP_FE(sybase_unbuffered_query, NULL)
- PHP_FE(sybase_free_result, NULL)
- PHP_FE(sybase_get_last_message, NULL)
- PHP_FE(sybase_num_rows, NULL)
- PHP_FE(sybase_num_fields, NULL)
- PHP_FE(sybase_fetch_row,NULL)
- PHP_FE(sybase_fetch_array, NULL)
- PHP_FE(sybase_fetch_assoc, NULL)
- PHP_FE(sybase_fetch_object, NULL)
- PHP_FE(sybase_data_seek,NULL)
- PHP_FE(sybase_fetch_field, NULL)
- PHP_FE(sybase_field_seek, NULL)
- PHP_FE(sybase_result, NULL)
- PHP_FE(sybase_affected_rows,NULL)
- PHP_FE(sybase_min_client_severity, NULL)
- PHP_FE(sybase_min_server_severity, NULL)
- PHP_FE(sybase_set_message_handler, NULL)
- PHP_FE(sybase_deadlock_retry_count, NULL)
-
- PHP_FALIAS(mssql_connect, sybase_connect,
NULL)
- PHP_FALIAS(mssql_pconnect, sybase_pconnect,
NULL)
- PHP_FALIAS(mssql_close, sybase_close,
NULL)
- PHP_FALIAS(mssql_select_db, sybase_select_db,
NULL)
- PHP_FALIAS(mssql_query, sybase_query,
NULL)
- PHP_FALIAS(mssql_unbuffered_query, sybase_unbuffered_query,
NULL)
- PHP_FALIAS(mssql_free_result, sybase_free_result,
NULL)
- PHP_FALIAS(mssql_get_last_message, sybase_get_last_message,
NULL)
- PHP_FALIAS(mssql_num_rows, sybase_num_rows,
NULL)
- PHP_FALIAS(mssql_num_fields,sybase_num_fields,
NULL)
- PHP_FALIAS(mssql_fetch_row, sybase_fetch_row,
NULL)
- PHP_FALIAS(mssql_fetch_array, sybase_fetch_array,
NULL)
- PHP_FALIAS(mssql_fetch_assoc, sybase_fetch_assoc,
NULL)
- PHP_FALIAS(mssql_fetch_object, sybase_fetch_object,
NULL)
- PHP_FALIAS(mssql_data_seek, sybase_data_seek,
NULL)
- PHP_FALIAS(mssql_fetch_field, sybase_fetch_field,
NULL)
- PHP_FALIAS(mssql_field_seek,sybase_field_seek,
NULL)
- PHP_FALIAS(mssql_result,sybase_result,
NULL)
- PHP_FALIAS(mssql_affected_rows, sybase_affected_rows,
NULL)
- PHP_FALIAS(mssql_min_client_severity, sybase_min_client_severity,
NULL)
- PHP_FALIAS(mssql_min_server_severity, sybase_min_server_severity,
NULL)
- PHP_FALIAS(mssql_set_message_handler, sybase_set_message_handler,
NULL)
- PHP_FALIAS(mssql_deadlock_retry_count, sybase_deadlock_retry_count,
NULL)
+ PHP_FE(sybase_connect, NULL)
+ PHP_FE(sybase_pconnect, NULL)
+ PHP_FE(sybase_close, NULL)
+ PHP_FE(sybase_select_db, NULL)
+ PHP_FE(sybase_query, NULL)
+ PHP_FE(sybase_unbuffered_query, NULL)
+
[PHP-CVS] cvs: php-src /ext/sybase_ct/tests test_msghandler.phpt
thekid Sun Jan 25 15:04:08 2004 EDT
Modified files:
/php-src/ext/sybase_ct/teststest_msghandler.phpt
Log:
- Added test for case when incorrect argument type is
passed to sybase_set_message_handler()
http://cvs.php.net/diff.php/php-src/ext/sybase_ct/tests/test_msghandler.phpt?r1=1.1r2=1.2ty=u
Index: php-src/ext/sybase_ct/tests/test_msghandler.phpt
diff -u php-src/ext/sybase_ct/tests/test_msghandler.phpt:1.1
php-src/ext/sybase_ct/tests/test_msghandler.phpt:1.2
--- php-src/ext/sybase_ct/tests/test_msghandler.phpt:1.1Fri Jan 23 21:18:13
2004
+++ php-src/ext/sybase_ct/tests/test_msghandler.phptSun Jan 25 15:04:08 2004
@@ -6,7 +6,7 @@
?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: test_msghandler.phpt,v 1.1 2004/01/24 02:18:13 thekid Exp $
+ * $Id: test_msghandler.phpt,v 1.2 2004/01/25 20:04:08 thekid Exp $
*/
require('test.inc');
@@ -18,6 +18,7 @@
echo 'Instance method: '; sybase_set_messagehandler_ex(array(new sybase(),
'handler'));
echo 'Lambda function: '; sybase_set_messagehandler_ex(create_function('', 'return
FALSE;'));
echo 'Unset: '; sybase_set_messagehandler_ex(NULL);
+ echo 'Incorrect type: '; sybase_set_messagehandler_ex(1);
echo 'Function:'; sybase_set_messagehandler_ex('sybase_msg_handler');
var_dump(sybase_select_ex($db, 'select getdate(NULL)'));
@@ -31,6 +32,9 @@
Instance method: bool(true)
Lambda function: bool(true)
Unset: bool(true)
+Incorrect type:
+Warning: sybase_set_message_handler(): First argumented is expected to be either
NULL, an array or string, integer given in %s/test.inc on line %d
+bool(false)
Function:bool(true)
Query: select getdate(NULL)
*** Caught Sybase Server Message #%d [Severity %d, state %d] at line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sybase_ct/tests test_connectionbased_msghandler.phpt
thekid Sun Jan 25 15:04:25 2004 EDT
Added files:
/php-src/ext/sybase_ct/teststest_connectionbased_msghandler.phpt
Log:
- Initial release
http://cvs.php.net/co.php/php-src/ext/sybase_ct/tests/test_connectionbased_msghandler.phpt?r=1.1p=1
Index: php-src/ext/sybase_ct/tests/test_connectionbased_msghandler.phpt
+++ php-src/ext/sybase_ct/tests/test_connectionbased_msghandler.phpt
--TEST--
Sybase-CT connection-based server message handler
--SKIPIF--
?php require('skipif.inc'); ?
--FILE--
?php
/* This file is part of PHP test framework for ext/sybase_ct
*
* $Id: test_connectionbased_msghandler.phpt,v 1.1 2004/01/25 20:04:24 thekid Exp $
*/
require('test.inc');
$db= sybase_connect_ex();
var_dump($db);
var_dump(sybase_set_message_handler('sybase_msg_handler', $db));
var_dump(sybase_select_ex($db, 'select getdate(NULL)'));
sybase_close($db);
?
--EXPECTF--
resource(%d) of type (sybase-ct link)
bool(true)
Query: select getdate(NULL)
*** Caught Sybase Server Message #%d [Severity %d, state %d] at line %d
%s
Return: boolean
bool(false)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/sybase_ct php_sybase_ct.c php_sybase_ct.h
thekid Sun Jan 25 15:14:11 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/sybase_ct php_sybase_ct.c php_sybase_ct.h
Log:
- MFH
http://cvs.php.net/diff.php/php-src/ext/sybase_ct/php_sybase_ct.c?r1=1.73.2.8r2=1.73.2.9ty=u
Index: php-src/ext/sybase_ct/php_sybase_ct.c
diff -u php-src/ext/sybase_ct/php_sybase_ct.c:1.73.2.8
php-src/ext/sybase_ct/php_sybase_ct.c:1.73.2.9
--- php-src/ext/sybase_ct/php_sybase_ct.c:1.73.2.8 Thu Aug 28 16:29:13 2003
+++ php-src/ext/sybase_ct/php_sybase_ct.c Sun Jan 25 15:14:05 2004
@@ -2,7 +2,7 @@
+--+
| PHP Version 4|
+--+
- | Copyright (c) 1997-2003 The PHP Group|
+ | Copyright (c) 1997-2004 The PHP Group|
+--+
| This source file is subject to version 3.0 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is|
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_sybase_ct.c,v 1.73.2.8 2003/08/28 20:29:13 andrey Exp $ */
+/* $Id: php_sybase_ct.c,v 1.73.2.9 2004/01/25 20:14:05 thekid Exp $ */
#ifdef HAVE_CONFIG_H
@@ -38,53 +38,54 @@
#if HAVE_SYBASE_CT
function_entry sybase_functions[] = {
- PHP_FE(sybase_connect, NULL)
- PHP_FE(sybase_pconnect, NULL)
- PHP_FE(sybase_close,NULL)
- PHP_FE(sybase_select_db,NULL)
- PHP_FE(sybase_query,NULL)
- PHP_FE(sybase_unbuffered_query, NULL)
- PHP_FE(sybase_free_result, NULL)
- PHP_FE(sybase_get_last_message, NULL)
- PHP_FE(sybase_num_rows, NULL)
- PHP_FE(sybase_num_fields, NULL)
- PHP_FE(sybase_fetch_row,NULL)
- PHP_FE(sybase_fetch_array, NULL)
- PHP_FE(sybase_fetch_assoc, NULL)
- PHP_FE(sybase_fetch_object, NULL)
- PHP_FE(sybase_data_seek,NULL)
- PHP_FE(sybase_fetch_field, NULL)
- PHP_FE(sybase_field_seek, NULL)
- PHP_FE(sybase_result, NULL)
- PHP_FE(sybase_affected_rows,NULL)
- PHP_FE(sybase_min_client_severity, NULL)
- PHP_FE(sybase_min_server_severity, NULL)
- PHP_FE(sybase_set_message_handler, NULL)
- PHP_FE(sybase_deadlock_retry_count, NULL)
-
- PHP_FALIAS(mssql_connect, sybase_connect,
NULL)
- PHP_FALIAS(mssql_pconnect, sybase_pconnect,
NULL)
- PHP_FALIAS(mssql_close, sybase_close,
NULL)
- PHP_FALIAS(mssql_select_db, sybase_select_db,
NULL)
- PHP_FALIAS(mssql_query, sybase_query,
NULL)
- PHP_FALIAS(mssql_unbuffered_query, sybase_unbuffered_query,
NULL)
- PHP_FALIAS(mssql_free_result, sybase_free_result,
NULL)
- PHP_FALIAS(mssql_get_last_message, sybase_get_last_message,
NULL)
- PHP_FALIAS(mssql_num_rows, sybase_num_rows,
NULL)
- PHP_FALIAS(mssql_num_fields,sybase_num_fields,
NULL)
- PHP_FALIAS(mssql_fetch_row, sybase_fetch_row,
NULL)
- PHP_FALIAS(mssql_fetch_array, sybase_fetch_array,
NULL)
- PHP_FALIAS(mssql_fetch_assoc, sybase_fetch_assoc,
NULL)
- PHP_FALIAS(mssql_fetch_object, sybase_fetch_object,
NULL)
- PHP_FALIAS(mssql_data_seek, sybase_data_seek,
NULL)
- PHP_FALIAS(mssql_fetch_field, sybase_fetch_field,
NULL)
- PHP_FALIAS(mssql_field_seek,sybase_field_seek,
NULL)
- PHP_FALIAS(mssql_result,sybase_result,
NULL)
- PHP_FALIAS(mssql_affected_rows, sybase_affected_rows,
NULL)
- PHP_FALIAS(mssql_min_client_severity, sybase_min_client_severity,
NULL)
- PHP_FALIAS(mssql_min_server_severity, sybase_min_server_severity,
NULL)
-
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS
iliaa Sun Jan 25 15:43:33 2004 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: sybase_ct extension fixes and improvements by Timm Friebe. http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.538r2=1.1247.2.539ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.538 php-src/NEWS:1.1247.2.539 --- php-src/NEWS:1.1247.2.538 Wed Jan 21 05:12:17 2004 +++ php-src/NEWSSun Jan 25 15:43:32 2004 @@ -1,6 +1,12 @@ PHP 4 NEWS ||| ?? Jan 2004, Version 4.3.5 +- Improved the sybase_ct module (Timm) + . Added ability to define a message handler not only globally, but also per +connection. + . Made sybct.login_timeout changeable at runtime. + . Added ini option sybct.packet_size which lets you control the packet size. + . Fixed memory leak in sybase_set_message_handler(). - Fixed bug #26974 (rename() doesn't check the destination file against safe_mode/open_basedir). (Ilia) - Fixed bug #26973 (*printf() '+' modifier broken). (Jani) @@ -21,6 +27,8 @@ (Wez, Ilia) - Fixed bug #26381 (rand() without srand() doesn't work with certain php.ini). (Jani) +- Fixed bug #22403 (PHP crashes when executing a sql procedure without + parameters). (Timm) - Fixed bug #21513 (shutdown functions not executed if timed out). (Zeev) 12 Jan 2004, Version 4.3.5RC1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS
iliaa Sun Jan 25 18:55:44 2004 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: bug fixing news. http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.539r2=1.1247.2.540ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.539 php-src/NEWS:1.1247.2.540 --- php-src/NEWS:1.1247.2.539 Sun Jan 25 15:43:32 2004 +++ php-src/NEWSSun Jan 25 18:55:43 2004 @@ -23,6 +23,8 @@ - Fixed bug #26878 (problem with multiple references to the same variable with different types). (Ilia) - Fixed bug #26896 (ext/ftp does not work as shared extension). (Jani) +- Fixed bug #26814 (On parse error include included file, terminate + execution script). (Ilia) - Fixed bug #26772, #26967 (file operations return NULL instead of FALSE). (Wez, Ilia) - Fixed bug #26381 (rand() without srand() doesn't work with certain php.ini). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_3) / NEWS
On Sun, Jan 25, 2004 at 11:55:44PM -, Ilia Alshanetsky wrote: iliaa Sun Jan 25 18:55:44 2004 EDT Modified files: (Branch: PHP_4_3) /php-src NEWS Log: bug fixing news. ... +- Fixed bug #26814 (On parse error include included file, terminate + execution script). (Ilia) I can't parse that statement. Please reword it for the benefit of the end-users who are the intended audience of NEWS. -- Jon Parise ([EMAIL PROTECTED]) :: The PHP Project (http://www.php.net/) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS
iliaa Sun Jan 25 19:15:13 2004 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: A better bug description, for people without the official Ilia decoder ring. http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.540r2=1.1247.2.541ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.540 php-src/NEWS:1.1247.2.541 --- php-src/NEWS:1.1247.2.540 Sun Jan 25 18:55:43 2004 +++ php-src/NEWSSun Jan 25 19:15:10 2004 @@ -23,8 +23,8 @@ - Fixed bug #26878 (problem with multiple references to the same variable with different types). (Ilia) - Fixed bug #26896 (ext/ftp does not work as shared extension). (Jani) -- Fixed bug #26814 (On parse error include included file, terminate - execution script). (Ilia) +- Fixed bug #26814 (When included file has a parse error, terminate script + execution). (Ilia) - Fixed bug #26772, #26967 (file operations return NULL instead of FALSE). (Wez, Ilia) - Fixed bug #26381 (rand() without srand() doesn't work with certain php.ini). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/curl curl.c
sniper Sun Jan 25 19:18:26 2004 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS /php-src/ext/curl curl.c Log: MFH: - Fixed bug #27040 (passing an array of form-fields to CURLOPT_POSTFIELDS does not work). http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.541r2=1.1247.2.542ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.541 php-src/NEWS:1.1247.2.542 --- php-src/NEWS:1.1247.2.541 Sun Jan 25 19:15:10 2004 +++ php-src/NEWSSun Jan 25 19:18:24 2004 @@ -1,12 +1,14 @@ PHP 4 NEWS ||| ?? Jan 2004, Version 4.3.5 -- Improved the sybase_ct module (Timm) +- Improved the sybase_ct module: (Timm) . Added ability to define a message handler not only globally, but also per connection. - . Made sybct.login_timeout changeable at runtime. - . Added ini option sybct.packet_size which lets you control the packet size. + . Added sybct.packet_size php.ini option. + . Changed sybct.login_timeout php.ini option changeable at runtime. . Fixed memory leak in sybase_set_message_handler(). +- Fixed bug #27040 (passing an array of form-fields to CURLOPT_POSTFIELDS + does not work). (Ilia, Jani) - Fixed bug #26974 (rename() doesn't check the destination file against safe_mode/open_basedir). (Ilia) - Fixed bug #26973 (*printf() '+' modifier broken). (Jani) http://cvs.php.net/diff.php/php-src/ext/curl/curl.c?r1=1.124.2.14r2=1.124.2.15ty=u Index: php-src/ext/curl/curl.c diff -u php-src/ext/curl/curl.c:1.124.2.14 php-src/ext/curl/curl.c:1.124.2.15 --- php-src/ext/curl/curl.c:1.124.2.14 Thu Oct 16 05:08:42 2003 +++ php-src/ext/curl/curl.c Sun Jan 25 19:18:25 2004 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: curl.c,v 1.124.2.14 2003/10/16 09:08:42 sniper Exp $ */ +/* $Id: curl.c,v 1.124.2.15 2004/01/26 00:18:25 sniper Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -886,7 +886,7 @@ error = curl_formadd(first, last, CURLFORM_COPYNAME, string_key, CURLFORM_NAMELENGTH, string_key_len - 1, - CURLFORM_PTRCONTENTS, postval, + (ZVAL_REFCOUNT(*zvalue) 1 ? CURLFORM_PTRCONTENTS : CURLFORM_COPYCONTENTS), postval, CURLFORM_CONTENTSLENGTH, Z_STRLEN_PP(current), CURLFORM_END); } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mbstring/libmbfl/mbfl mbfilter_8bit.c
moriyoshi Sun Jan 25 19:19:25 2004 EDT
Modified files:
/php-src/ext/mbstring/libmbfl/mbfl mbfilter_8bit.c
Log:
- Fix bug #26699 (mbstring encoding types does not include binary).
http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c?r1=1.1r2=1.2ty=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c:1.1
php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c:1.2
--- php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c:1.1 Sat Aug 23 02:18:38
2003
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c Sun Jan 25 19:19:25 2004
@@ -38,11 +38,13 @@
#include mbfilter.h
+static const char *mbfl_encoding_8bit_aliases[] = {binary, NULL};
+
const mbfl_encoding mbfl_encoding_8bit = {
mbfl_no_encoding_8bit,
8bit,
8bit,
- NULL,
+ mbfl_encoding_8bit_aliases,
NULL,
MBFL_ENCTYPE_SBCS
};
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mbstring/libmbfl/mbfl mbfilter_8bit.c
moriyoshi Sun Jan 25 19:21:58 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mbstring/libmbfl/mbfl mbfilter_8bit.c
Log:
- MFH(r-1.2): Fix bug #26699 (mbstring doesn't identify binary as a valid encoding
name)
http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c?r1=1.1.2.1r2=1.1.2.2ty=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c:1.1.2.1
php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c:1.1.2.2
--- php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c:1.1.2.1 Sat Oct 25 07:58:44
2003
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c Sun Jan 25 19:21:57 2004
@@ -38,11 +38,13 @@
#include mbfilter.h
+static const char *mbfl_encoding_8bit_aliases[] = {binary, NULL};
+
const mbfl_encoding mbfl_encoding_8bit = {
mbfl_no_encoding_8bit,
8bit,
8bit,
- NULL,
+ mbfl_encoding_8bit_aliases,
NULL,
MBFL_ENCTYPE_SBCS
};
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mbstring/libmbfl/mbfl mbfilter_8bit.c
moriyoshi Sun Jan 25 19:27:24 2004 EDT Modified files: /php-src/ext/mbstring/libmbfl/mbfl mbfilter_8bit.c Log: - Suppress a compiler warning by a rather useless typecasting. http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c?r1=1.2r2=1.3ty=u Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c:1.2 php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c:1.3 --- php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c:1.2 Sun Jan 25 19:19:25 2004 +++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c Sun Jan 25 19:27:24 2004 @@ -44,7 +44,7 @@ mbfl_no_encoding_8bit, 8bit, 8bit, - mbfl_encoding_8bit_aliases, + (const char *(*)[])mbfl_encoding_8bit_aliases, NULL, MBFL_ENCTYPE_SBCS }; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mbstring/libmbfl/mbfl mbfilter_8bit.c
moriyoshi Sun Jan 25 19:27:54 2004 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/mbstring/libmbfl/mbfl mbfilter_8bit.c Log: - MFH(r-1.3): Suppress a compiler warning by a rather useless typecasting. http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c?r1=1.1.2.2r2=1.1.2.3ty=u Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c:1.1.2.2 php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c:1.1.2.3 --- php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c:1.1.2.2 Sun Jan 25 19:21:57 2004 +++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c Sun Jan 25 19:27:54 2004 @@ -44,7 +44,7 @@ mbfl_no_encoding_8bit, 8bit, 8bit, - mbfl_encoding_8bit_aliases, + (const char *(*)[])mbfl_encoding_8bit_aliases, NULL, MBFL_ENCTYPE_SBCS }; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS
moriyoshi Sun Jan 25 19:30:46 2004 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.542r2=1.1247.2.543ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.542 php-src/NEWS:1.1247.2.543 --- php-src/NEWS:1.1247.2.542 Sun Jan 25 19:18:24 2004 +++ php-src/NEWSSun Jan 25 19:30:42 2004 @@ -57,6 +57,8 @@ system). (Derick) - Fixed Bug #26703 (Certain characters inside strings incorrectly treated as keywords). (vrana [at] php [dot] net, Ilia) +- Fixed bug #26699 (mbstring doesn't identify binary as a valid encoding). + (nirva-php at ishiboo dot com, Moriyoshi) - Fixed bug #26667 (Added safety checks to ip2long()). (Ilia) - Fixed bug #26639 (mb_convert_variables() clutters variables beyond the references). (Moriyoshi) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended /main main.c php_globals.h php_variables.c
sniper Sun Jan 25 23:15:09 2004 EDT
Modified files:
/php-srcphp.ini-dist php.ini-recommended
/php-src/main main.c php_globals.h php_variables.c
Log:
- Remove gpc_order since it doesn't serve any purpose.
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.204r2=1.205ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.204 php-src/php.ini-dist:1.205
--- php-src/php.ini-dist:1.204 Sun Jan 25 10:18:02 2004
+++ php-src/php.ini-distSun Jan 25 23:15:04 2004
@@ -382,9 +382,6 @@
; Maximum size of POST data that PHP will accept.
post_max_size = 8M
-; This directive is deprecated. Use variables_order instead.
-gpc_order = GPC
-
; Magic quotes
;
@@ -531,7 +528,7 @@
;Windows Extensions
-;Note that ODBC support is now built in, so no dll is needed for it.
+;Note that ODBC support is built in, so no dll is needed for it.
;
;extension=php_bz2.dll
;extension=php_cpdf.dll
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.149r2=1.150ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.149 php-src/php.ini-recommended:1.150
--- php-src/php.ini-recommended:1.149 Sun Jan 25 10:18:02 2004
+++ php-src/php.ini-recommended Sun Jan 25 23:15:04 2004
@@ -401,9 +401,6 @@
; Maximum size of POST data that PHP will accept.
post_max_size = 8M
-; This directive is deprecated. Use variables_order instead.
-gpc_order = GPC
-
; Magic quotes
;
@@ -550,7 +547,7 @@
;Windows Extensions
-;Note that ODBC support is now built in, so no dll is needed for it.
+;Note that ODBC support is built in, so no dll is needed for it.
;
;extension=php_bz2.dll
;extension=php_cpdf.dll
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.585r2=1.586ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.585 php-src/main/main.c:1.586
--- php-src/main/main.c:1.585 Thu Jan 8 03:17:53 2004
+++ php-src/main/main.c Sun Jan 25 23:15:08 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.585 2004/01/08 08:17:53 andi Exp $ */
+/* $Id: main.c,v 1.586 2004/01/26 04:15:08 sniper Exp $ */
/* {{{ includes
*/
@@ -297,7 +297,6 @@
STD_PHP_INI_ENTRY(default_mimetype, SAPI_DEFAULT_MIMETYPE,
PHP_INI_ALL,OnUpdateString, default_mimetype,
sapi_globals_struct,sapi_globals)
STD_PHP_INI_ENTRY(error_log, NULL,
PHP_INI_ALL,OnUpdateString, error_log,
php_core_globals, core_globals)
STD_PHP_INI_ENTRY(extension_dir, PHP_EXTENSION_DIR,
PHP_INI_SYSTEM, OnUpdateStringUnempty, extension_dir,
php_core_globals, core_globals)
- STD_PHP_INI_ENTRY(gpc_order, GPC,
PHP_INI_ALL,OnUpdateStringUnempty, gpc_order,
php_core_globals, core_globals)
STD_PHP_INI_ENTRY(include_path, PHP_INCLUDE_PATH,
PHP_INI_ALL,OnUpdateStringUnempty, include_path,
php_core_globals, core_globals)
PHP_INI_ENTRY(max_execution_time, 30,
PHP_INI_ALL,OnUpdateTimeout)
STD_PHP_INI_ENTRY(open_basedir, NULL,
PHP_INI_SYSTEM, OnUpdateString, open_basedir,
php_core_globals, core_globals)
@@ -309,7 +308,7 @@
STD_PHP_INI_ENTRY(upload_tmp_dir, NULL,
PHP_INI_SYSTEM, OnUpdateStringUnempty, upload_tmp_dir,
php_core_globals, core_globals)
STD_PHP_INI_ENTRY(user_dir, NULL,
PHP_INI_SYSTEM, OnUpdateString, user_dir,
php_core_globals, core_globals)
- STD_PHP_INI_ENTRY(variables_order,NULL, PHP_INI_ALL,
OnUpdateStringUnempty, variables_order,php_core_globals,
core_globals)
+ STD_PHP_INI_ENTRY(variables_order,EGPCS,PHP_INI_ALL,
OnUpdateStringUnempty, variables_order,php_core_globals,
core_globals)
STD_PHP_INI_ENTRY(error_append_string,NULL, PHP_INI_ALL,
OnUpdateString, error_append_string,php_core_globals,
core_globals)
STD_PHP_INI_ENTRY(error_prepend_string, NULL, PHP_INI_ALL,
OnUpdateString, error_prepend_string, php_core_globals,
core_globals)
http://cvs.php.net/diff.php/php-src/main/php_globals.h?r1=1.95r2=1.96ty=u
Index: php-src/main/php_globals.h
diff -u php-src/main/php_globals.h:1.95 php-src/main/php_globals.h:1.96
---
[PHP-CVS] cvs: php-src /tests/lang bug26900.phpt
sniper Sun Jan 25 23:37:51 2004 EDT
Added files:
/php-src/tests/lang bug26900.phpt
Log:
test for bug #26900
http://cvs.php.net/co.php/php-src/tests/lang/bug26900.phpt?r=1.1p=1
Index: php-src/tests/lang/bug26900.phpt
+++ php-src/tests/lang/bug26900.phpt
--TEST--
Bug #26900 (Memory leak when passing arguments to __clone())
--FILE--
?php
class foo {
function __clone() {}
}
$a = new foo;
$b = $a-__clone('bad argument');
echo OK\n;
?
--EXPECT--
OK
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl interface.c
sniper Sun Jan 25 23:59:59 2004 EDT Modified files: /php-src/ext/curl interface.c Log: - Fixed compile problem with CURLOPT_HTTPAUTH http://cvs.php.net/diff.php/php-src/ext/curl/interface.c?r1=1.30r2=1.31ty=u Index: php-src/ext/curl/interface.c diff -u php-src/ext/curl/interface.c:1.30 php-src/ext/curl/interface.c:1.31 --- php-src/ext/curl/interface.c:1.30 Sun Jan 25 19:16:16 2004 +++ php-src/ext/curl/interface.cSun Jan 25 23:59:59 2004 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: interface.c,v 1.30 2004/01/26 00:16:16 sniper Exp $ */ +/* $Id: interface.c,v 1.31 2004/01/26 04:59:59 sniper Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -212,15 +212,15 @@ REGISTER_CURL_CONSTANT(CURLOPT_FTP_USE_EPRT); REGISTER_CURL_CONSTANT(CURLOPT_HTTP200ALIASES); -#ifdef CURLOPT_HTTPAUTH /* only in curl 7.10.6 */ +#if LIBCURL_VERSION_NUM 0x070a05 /* CURLOPT_HTTPAUTH is available since curl 7.10.6 */ REGISTER_CURL_CONSTANT(CURLOPT_HTTPAUTH); /* http authentication options */ - REGISTER_CURL_CONSTANT(CURLHTTP_BASIC); - REGISTER_CURL_CONSTANT(CURLHTTP_DIGEST); - REGISTER_CURL_CONSTANT(CURLHTTP_GSSNEGOTIATE); - REGISTER_CURL_CONSTANT(CURLHTTP_NTLM); - REGISTER_CURL_CONSTANT(CURLHTTP_ANY); - REGISTER_CURL_CONSTANT(CURLHTTP_ANYSAFE); + REGISTER_CURL_CONSTANT(CURLAUTH_BASIC); + REGISTER_CURL_CONSTANT(CURLAUTH_DIGEST); + REGISTER_CURL_CONSTANT(CURLAUTH_GSSNEGOTIATE); + REGISTER_CURL_CONSTANT(CURLAUTH_NTLM); + REGISTER_CURL_CONSTANT(CURLAUTH_ANY); + REGISTER_CURL_CONSTANT(CURLAUTH_ANYSAFE); #endif /* Constants effecting the way CURLOPT_CLOSEPOLICY works */ @@ -831,7 +831,7 @@ case CURLOPT_DNS_CACHE_TIMEOUT: case CURLOPT_PROXYPORT: case CURLOPT_FTP_USE_EPRT: -#ifdef CURLOPT_HTTPAUTH /* only in curl 7.10.6 */ +#if LIBCURL_VERSION_NUM 0x070a05 /* CURLOPT_HTTPAUTH is available since curl 7.10.6 */ case CURLOPT_HTTPAUTH: #endif case CURLOPT_UNRESTRICTED_AUTH: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
