[PHP-CVS] cvs: php-src / NEWS /ext/standard info.c

2004-03-14 Thread Jon Parise
jon Mon Mar 15 02:45:27 2004 EDT

  Modified files:  
/php-srcNEWS 
/php-src/ext/standard   info.c 
  Log:
  Fixed crash in php_ini_scanned_files() when no additional INI files were 
  actually parsed.
  
  I'll merge this into the PHP_4_3 branch as soon as I receive permission
  from the release master.
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1634&r2=1.1635&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1634 php-src/NEWS:1.1635
--- php-src/NEWS:1.1634 Mon Mar 15 00:53:51 2004
+++ php-src/NEWSMon Mar 15 02:45:24 2004
@@ -34,6 +34,8 @@
 - Methods that override parent methods are now subject to prototype checking,
   and have to be compatible with the method they're overriding - this check is 
   disabled in compatibility mode. (Andi, Zeev)
+- Fixed crash in php_ini_scanned_files() when no additional INI files were
+  actually parsed. (Jon)
 - Fixed bug in gdImageFilledRectangle in the bundled GD library, that required
   x1 < x2 and y1 < y2 for coordinates. (Derick)
 - Fixed crash with foreach() and temporary objects($obj->method()->a ...) where
http://cvs.php.net/diff.php/php-src/ext/standard/info.c?r1=1.242&r2=1.243&ty=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.242 php-src/ext/standard/info.c:1.243
--- php-src/ext/standard/info.c:1.242   Wed Feb 18 00:07:13 2004
+++ php-src/ext/standard/info.c Mon Mar 15 02:45:25 2004
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: info.c,v 1.242 2004/02/18 05:07:13 pollita Exp $ */
+/* $Id: info.c,v 1.243 2004/03/15 07:45:25 jon Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -1080,7 +1080,7 @@
Return comma-separated string of .ini files parsed from the additional ini dir */
 PHP_FUNCTION(php_ini_scanned_files)
 {
-   if (strlen(PHP_CONFIG_FILE_SCAN_DIR)) {
+   if (strlen(PHP_CONFIG_FILE_SCAN_DIR) && php_ini_scanned_files) {
RETURN_STRING(php_ini_scanned_files, 1);
} else {
RETURN_FALSE;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src / NEWS

2004-03-14 Thread Sebastian Bergmann
sebastian   Mon Mar 15 00:53:52 2004 EDT

  Modified files:  
/php-srcNEWS 
  Log:
  Fugbix typo.
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1633&r2=1.1634&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1633 php-src/NEWS:1.1634
--- php-src/NEWS:1.1633 Sun Mar 14 18:22:51 2004
+++ php-src/NEWSMon Mar 15 00:53:51 2004
@@ -5,7 +5,7 @@
   ze1_compatiblity_mode. (Andi)
 - Added support for PHP 4 style object conversion to long, double, and boolean
   values which is enabled in ze1_compatibility_mode. (Andi, Stas)
-- Allow objector oriented extensions to overload comparison functions and other
+- Allow object oriented extensions to overload comparison functions and other
   operations. Solves problems using SimpleXML values. (Andi, Zeev)
 - Fixed crash when accessing a class constant with a value which in turn is
   also a constant. (Dmitry)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src /main main.c output.c php_output.h

2004-03-14 Thread Marcus Boerger
helly   Sun Mar 14 18:56:08 2004 EDT

  Modified files:  
/php-src/main   main.c output.c php_output.h 
  Log:
  Guard display_startup_errors with checking for default (working) output
  functions.
  
  
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.595&r2=1.596&ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.595 php-src/main/main.c:1.596
--- php-src/main/main.c:1.595   Wed Feb 25 05:58:06 2004
+++ php-src/main/main.c Sun Mar 14 18:56:07 2004
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.595 2004/02/25 10:58:06 zeev Exp $ */
+/* $Id: main.c,v 1.596 2004/03/14 23:56:07 helly Exp $ */
 
 /* {{{ includes
  */
@@ -752,7 +752,12 @@
efree(log_buffer);
}
if (PG(display_errors)
-   && ((!PG(during_request_startup) && 
PG(display_startup_errors)) || module_initialized)) {
+   && ((module_initialized && !PG(during_request_startup))
+   || (PG(display_startup_errors) 
+   && 
(OG(php_body_write)==php_default_output_func || 
OG(php_body_write)==php_ub_body_write_no_header || 
OG(php_body_write)==php_ub_body_write)
+   )
+   )
+   ) {
 
if (PG(xmlrpc_errors)) {
php_printf("faultCode%ldfaultString%s:%s
 in %s on line 
%d", 
PG(xmlrpc_error_number), error_type_str, buffer, error_filename, error_lineno);
http://cvs.php.net/diff.php/php-src/main/output.c?r1=1.163&r2=1.164&ty=u
Index: php-src/main/output.c
diff -u php-src/main/output.c:1.163 php-src/main/output.c:1.164
--- php-src/main/output.c:1.163 Thu Jan  8 03:17:53 2004
+++ php-src/main/output.c   Sun Mar 14 18:56:07 2004
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: output.c,v 1.163 2004/01/08 08:17:53 andi Exp $ */
+/* $Id: output.c,v 1.164 2004/03/14 23:56:07 helly Exp $ */
 
 #include "php.h"
 #include "ext/standard/head.h"
@@ -32,8 +32,6 @@
 #define OB_DEFAULT_HANDLER_NAME "default output handler"
 
 /* output functions */
-static int php_ub_body_write(const char *str, uint str_length TSRMLS_DC);
-static int php_ub_body_write_no_header(const char *str, uint str_length TSRMLS_DC);
 static int php_b_body_write(const char *str, uint str_length TSRMLS_DC);
 
 static int php_ob_init(uint initial_size, uint block_size, zval *output_handler, uint 
chunk_size, zend_bool erase TSRMLS_DC);
@@ -49,7 +47,7 @@
 #endif
 
 /* {{{ php_default_output_func */
-static inline int php_default_output_func(const char *str, uint str_len TSRMLS_DC)
+PHPAPI int php_default_output_func(const char *str, uint str_len TSRMLS_DC)
 {
fwrite(str, 1, str_len, stderr);
return str_len;
@@ -675,7 +673,7 @@
 
 /* {{{ php_ub_body_write_no_header
  */
-static int php_ub_body_write_no_header(const char *str, uint str_length TSRMLS_DC)
+PHPAPI int php_ub_body_write_no_header(const char *str, uint str_length TSRMLS_DC)
 {
int result;
 
@@ -695,7 +693,7 @@
 
 /* {{{ php_ub_body_write
  */
-static int php_ub_body_write(const char *str, uint str_length TSRMLS_DC)
+PHPAPI int php_ub_body_write(const char *str, uint str_length TSRMLS_DC)
 {
int result = 0;
 
http://cvs.php.net/diff.php/php-src/main/php_output.h?r1=1.51&r2=1.52&ty=u
Index: php-src/main/php_output.h
diff -u php-src/main/php_output.h:1.51 php-src/main/php_output.h:1.52
--- php-src/main/php_output.h:1.51  Fri Feb 20 03:04:30 2004
+++ php-src/main/php_output.h   Sun Mar 14 18:56:07 2004
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: php_output.h,v 1.51 2004/02/20 08:04:30 hholzgra Exp $ */
+/* $Id: php_output.h,v 1.52 2004/03/14 23:56:07 helly Exp $ */
 
 #ifndef PHP_OUTPUT_H
 #define PHP_OUTPUT_H
@@ -28,6 +28,9 @@
 PHPAPI void php_output_activate(TSRMLS_D);
 PHPAPI void php_output_set_status(zend_bool status TSRMLS_DC);
 PHPAPI void php_output_register_constants(TSRMLS_D);
+PHPAPI int  php_default_output_func(const char *str, uint str_len TSRMLS_DC);
+PHPAPI int  php_ub_body_write(const char *str, uint str_length TSRMLS_DC);
+PHPAPI int  php_ub_body_write_no_header(const char *str, uint str_length TSRMLS_DC);
 PHPAPI int  php_body_write(const char *str, uint str_length TSRMLS_DC);
 PHPAPI int  php_header_write(const char *str, uint str_length TSRMLS_DC);
 PHPAPI int php_start_ob_buffer(zval *output_handler, uint chunk_size, zend_bool erase 
TSRMLS_DC);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src / NEWS

2004-03-14 Thread Jani Taskinen
sniper  Sun Mar 14 18:22:52 2004 EDT

  Modified files:  
/php-srcNEWS 
  Log:
  typo
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1632&r2=1.1633&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1632 php-src/NEWS:1.1633
--- php-src/NEWS:1.1632 Sun Mar 14 18:01:21 2004
+++ php-src/NEWSSun Mar 14 18:22:51 2004
@@ -11,7 +11,7 @@
   also a constant. (Dmitry)
 - Fixed object's truth value conversion. It is always true unless
   ze1_compatibility_mode is on in which it behaves like in PHP 4. (Stas)
-- Improve out of memory handling in new memory manager. (Stas)
+- Improved out of memory handling in new memory manager. (Stas)
 - Fixed crash when an object references itself during destructor call. (Andi)
 - Fixed crash in foreach() when iterating over object properties or a method's
   return values. (Andi)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src / NEWS

2004-03-14 Thread Marcus Boerger
helly   Sun Mar 14 18:01:24 2004 EDT

  Modified files:  
/php-srcNEWS 
  Log:
  BFN
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1631&r2=1.1632&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1631 php-src/NEWS:1.1632
--- php-src/NEWS:1.1631 Sun Mar 14 16:27:21 2004
+++ php-src/NEWSSun Mar 14 18:01:21 2004
@@ -53,6 +53,8 @@
 - Fixed bug #27237 (Working with simplexml crashes apache2). (Rob)
 - Fixed bug #27227 (Mixed case class names causes Fatal Error in Constructor 
   call). (Marcus)
+- Fixed bug #27125 (strval() doesn't work for objects with __toString()).
+  (Marcus)
 - Fixed bug #27123 (Fix crash caused by bug in get_object_vars()). (Andi)
 - Fixed bug #26677 (mbstring compile errors with IRIX compiler).
   (K.Kosako , Rui, Moriyoshi)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src /ext/standard type.c

2004-03-14 Thread Marcus Boerger
helly   Sun Mar 14 17:59:06 2004 EDT

  Modified files:  
/php-src/ext/standard   type.c 
  Log:
  Fix strval to use __toString if necessary
  
http://cvs.php.net/diff.php/php-src/ext/standard/type.c?r1=1.23&r2=1.24&ty=u
Index: php-src/ext/standard/type.c
diff -u php-src/ext/standard/type.c:1.23 php-src/ext/standard/type.c:1.24
--- php-src/ext/standard/type.c:1.23Thu Jan  8 03:17:34 2004
+++ php-src/ext/standard/type.c Sun Mar 14 17:59:04 2004
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: type.c,v 1.23 2004/01/08 08:17:34 andi Exp $ */
+/* $Id: type.c,v 1.24 2004/03/14 22:59:04 helly Exp $ */
 
 #include "php.h"
 #include "php_incomplete_class.h"
@@ -180,14 +180,24 @@
 PHP_FUNCTION(strval)
 {
pval **num;
+   zval expr_copy;
+   int use_copy;
 
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &num) == FAILURE) {
WRONG_PARAM_COUNT;
}
 
*return_value = **num;
-   zval_copy_ctor(return_value);
-   convert_to_string(return_value);
+
+   zend_make_printable_zval(return_value, &expr_copy, &use_copy);
+   if (use_copy) {
+   *return_value = expr_copy;
+   INIT_PZVAL(return_value);
+   zval_copy_ctor(return_value);
+   zval_dtor(&expr_copy);
+   } else {
+   zval_copy_ctor(return_value);
+   }
 }
 /* }}} */
 

-- 
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

2004-03-14 Thread Derick Rethans
derick  Sun Mar 14 17:00:23 2004 EDT

  Modified files:  
/php-srcphp.ini-dist 
  Log:
  - That change was unintentional, but it would be the right thing to do ;-)
  
  
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.210&r2=1.211&ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.210 php-src/php.ini-dist:1.211
--- php-src/php.ini-dist:1.210  Sun Mar 14 16:36:17 2004
+++ php-src/php.ini-distSun Mar 14 17:00:22 2004
@@ -389,7 +389,7 @@
 ;
 
 ; Magic quotes for incoming GET/POST/Cookie data.
-magic_quotes_gpc = Off
+magic_quotes_gpc = On
 
 ; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc.
 magic_quotes_runtime = Off

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



Re: [PHP-CVS] cvs: php-src / NEWS

2004-03-14 Thread Andi Gutmans
At 10:38 PM 3/14/2004 +0100, Derick Rethans wrote:
On Sun, 14 Mar 2004, Andi Gutmans wrote:

> Sorry I didn't realize it was so accurately ordered :)

I'm just falling in for Jani ;-)
:)

Andi

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php


Re: [PHP-CVS] cvs: php-src / NEWS

2004-03-14 Thread Derick Rethans
On Sun, 14 Mar 2004, Andi Gutmans wrote:

> Sorry I didn't realize it was so accurately ordered :)

I'm just falling in for Jani ;-)

Derick

-- 
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

2004-03-14 Thread Derick Rethans
derick  Sun Mar 14 16:36:19 2004 EDT

  Modified files:  
/php-srcphp.ini-dist php.ini-recommended 
  Log:
  - The extension list is ordered alphabetically, also moved the tidy section
to a more suitable place (new things go at the end, not at the start).
  
  
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.209&r2=1.210&ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.209 php-src/php.ini-dist:1.210
--- php-src/php.ini-dist:1.209  Sat Mar 13 20:26:33 2004
+++ php-src/php.ini-distSun Mar 14 16:36:17 2004
@@ -389,7 +389,7 @@
 ;
 
 ; Magic quotes for incoming GET/POST/Cookie data.
-magic_quotes_gpc = On
+magic_quotes_gpc = Off
 
 ; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc.
 magic_quotes_runtime = Off
@@ -538,7 +538,6 @@
 ;Note that ODBC support is built in, so no dll is needed for it.
 ;
 
-;extension=php_tidy.dll
 ;extension=php_bz2.dll
 ;extension=php_cpdf.dll
 ;extension=php_curl.dll
@@ -573,6 +572,7 @@
 ;extension=php_snmp.dll
 ;extension=php_sockets.dll
 ;extension=php_sybase_ct.dll
+;extension=php_tidy.dll
 ;extension=php_w32api.dll
 ;extension=php_xmlrpc.dll
 ;extension=php_xsl.dll
@@ -584,15 +584,6 @@
 ; Module Settings ;
 ;;;
 
-[Tidy]
-; The path to a default tidy configuration file to use when using tidy
-;tidy.default_config = /usr/local/lib/php/default.tcfg
-
-; Should tidy clean and repair output automatically?
-; WARNING: Do not use this option if you are generating non-html content
-; such as dynamic images
-tidy.clean_output = Off
-
 [Syslog]
 ; Whether or not to define the various syslog variables (e.g. $LOG_PID,
 ; $LOG_CRON, etc.).  Turning it off is a good idea performance-wise.  In
@@ -1167,6 +1158,15 @@
 ;exif.decode_jis_motorola = JIS
 ;exif.decode_jis_intel= JIS
 
+[Tidy]
+; The path to a default tidy configuration file to use when using tidy
+;tidy.default_config = /usr/local/lib/php/default.tcfg
+
+; Should tidy clean and repair output automatically?
+; WARNING: Do not use this option if you are generating non-html content
+; such as dynamic images
+tidy.clean_output = Off
+
 ; Local Variables:
 ; tab-width: 4
 ; End:
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.154&r2=1.155&ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.154 php-src/php.ini-recommended:1.155
--- php-src/php.ini-recommended:1.154   Sat Mar 13 20:26:33 2004
+++ php-src/php.ini-recommended Sun Mar 14 16:36:17 2004
@@ -557,7 +557,6 @@
 ;Note that ODBC support is built in, so no dll is needed for it.
 ;
 
-;extension=php_tidy.dll
 ;extension=php_bz2.dll
 ;extension=php_cpdf.dll
 ;extension=php_curl.dll
@@ -593,6 +592,7 @@
 ;extension=php_snmp.dll
 ;extension=php_sockets.dll
 ;extension=php_sybase_ct.dll
+;extension=php_tidy.dll
 ;extension=php_w32api.dll
 ;extension=php_xmlrpc.dll
 ;extension=php_xsl.dll
@@ -604,15 +604,6 @@
 ; Module Settings ;
 ;;;
 
-[Tidy]
-; The path to a default tidy configuration file to use when using tidy
-;tidy.default_config = /usr/local/lib/php/default.tcfg
-
-; Should tidy clean and repair output automatically?
-; WARNING: Do not use this option if you are generating non-html content
-; such as dynamic images
-tidy.clean_output = Off
-
 [Syslog]
 ; Whether or not to define the various syslog variables (e.g. $LOG_PID,
 ; $LOG_CRON, etc.).  Turning it off is a good idea performance-wise.  In
@@ -1181,6 +1172,15 @@
 ;exif.decode_jis_motorola = JIS
 ;exif.decode_jis_intel= JIS
 
+[Tidy]
+; The path to a default tidy configuration file to use when using tidy
+;tidy.default_config = /usr/local/lib/php/default.tcfg
+
+; Should tidy clean and repair output automatically?
+; WARNING: Do not use this option if you are generating non-html content
+; such as dynamic images
+tidy.clean_output = Off
+
 ; Local Variables:
 ; tab-width: 4
 ; End:

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



Re: [PHP-CVS] cvs: php-src / NEWS

2004-03-14 Thread Andi Gutmans
Sorry I didn't realize it was so accurately ordered :)
Thanks.
At 09:27 PM 3/14/2004 +, Derick Rethans wrote:
derick  Sun Mar 14 16:27:21 2004 EDT

  Modified files:
/php-srcNEWS
  Log:
  - Reorder
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1630&r2=1.1631&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1630 php-src/NEWS:1.1631
--- php-src/NEWS:1.1630 Sun Mar 14 16:23:48 2004
+++ php-src/NEWSSun Mar 14 16:27:21 2004
@@ -41,12 +41,11 @@
 - Fixed problem preventing startup errors from being displayed. (Marcus)
 - Fixed start-up problem if both SPL and SimpleXML were enabled. The double
   initialization of apache 1.3 was causing problems here. (Marcus, Derick)
-- Fixed bug #27504 (Visibility bugs in call_user_function()). (Dmitry)
-- Fixed bug #27123 (Fix crash caused by bug in get_object_vars()). (Andi)
-- Fixed bug #27535 (Problem with object freeing mechanism). (Dmitry)
 - Fixed bug #27586 (ArrayObject::getIterator crashes with [] assignment).
   (Marcus)
 - Fixed bug #27537 (Objects pointing to each other segfaults). (Dmitry)
+- Fixed bug #27535 (Problem with object freeing mechanism). (Dmitry)
+- Fixed bug #27504 (Visibility bugs in call_user_function()). (Dmitry)
 - Fixed bug #27338 (memory leak inside tsrm_virtual_cwd.c on win32). (Ilia)
 - Fixed bug #27287 (wddx segfaults during deserialization). (Moriyoshi)
 - Fixed bug #27263 (session extension crashes when unserializing referenced
@@ -54,6 +53,7 @@
 - Fixed bug #27237 (Working with simplexml crashes apache2). (Rob)
 - Fixed bug #27227 (Mixed case class names causes Fatal Error in 
Constructor
   call). (Marcus)
+- Fixed bug #27123 (Fix crash caused by bug in get_object_vars()). (Andi)
 - Fixed bug #26677 (mbstring compile errors with IRIX compiler).
   (K.Kosako , Rui, Moriyoshi)

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php


[PHP-CVS] cvs: php-src / NEWS

2004-03-14 Thread Derick Rethans
derick  Sun Mar 14 16:27:21 2004 EDT

  Modified files:  
/php-srcNEWS 
  Log:
  - Reorder
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1630&r2=1.1631&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1630 php-src/NEWS:1.1631
--- php-src/NEWS:1.1630 Sun Mar 14 16:23:48 2004
+++ php-src/NEWSSun Mar 14 16:27:21 2004
@@ -41,12 +41,11 @@
 - Fixed problem preventing startup errors from being displayed. (Marcus)
 - Fixed start-up problem if both SPL and SimpleXML were enabled. The double
   initialization of apache 1.3 was causing problems here. (Marcus, Derick)
-- Fixed bug #27504 (Visibility bugs in call_user_function()). (Dmitry)
-- Fixed bug #27123 (Fix crash caused by bug in get_object_vars()). (Andi)
-- Fixed bug #27535 (Problem with object freeing mechanism). (Dmitry)
 - Fixed bug #27586 (ArrayObject::getIterator crashes with [] assignment). 
   (Marcus)
 - Fixed bug #27537 (Objects pointing to each other segfaults). (Dmitry)
+- Fixed bug #27535 (Problem with object freeing mechanism). (Dmitry)
+- Fixed bug #27504 (Visibility bugs in call_user_function()). (Dmitry)
 - Fixed bug #27338 (memory leak inside tsrm_virtual_cwd.c on win32). (Ilia)
 - Fixed bug #27287 (wddx segfaults during deserialization). (Moriyoshi)
 - Fixed bug #27263 (session extension crashes when unserializing referenced
@@ -54,6 +53,7 @@
 - Fixed bug #27237 (Working with simplexml crashes apache2). (Rob)
 - Fixed bug #27227 (Mixed case class names causes Fatal Error in Constructor 
   call). (Marcus)
+- Fixed bug #27123 (Fix crash caused by bug in get_object_vars()). (Andi)
 - Fixed bug #26677 (mbstring compile errors with IRIX compiler).
   (K.Kosako , Rui, Moriyoshi)
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src / NEWS

2004-03-14 Thread Andi Gutmans
andiSun Mar 14 16:23:49 2004 EDT

  Modified files:  
/php-srcNEWS 
  Log:
  - Typo
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1629&r2=1.1630&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1629 php-src/NEWS:1.1630
--- php-src/NEWS:1.1629 Sun Mar 14 16:21:21 2004
+++ php-src/NEWSSun Mar 14 16:23:48 2004
@@ -12,7 +12,7 @@
 - Fixed object's truth value conversion. It is always true unless
   ze1_compatibility_mode is on in which it behaves like in PHP 4. (Stas)
 - Improve out of memory handling in new memory manager. (Stas)
-- Fixed crash when an object reference itself during destructor call. (Andi)
+- Fixed crash when an object references itself during destructor call. (Andi)
 - Fixed crash in foreach() when iterating over object properties or a method's
   return values. (Andi)
 - Fixed crash when an exception is thrown in a destructor. Such exceptions are

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src / NEWS

2004-03-14 Thread Andi Gutmans
andiSun Mar 14 16:21:22 2004 EDT

  Modified files:  
/php-srcNEWS 
  Log:
  - Add all of the fixes from the past week. Almost ready for RC1 now.
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1628&r2=1.1629&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1628 php-src/NEWS:1.1629
--- php-src/NEWS:1.1628 Sat Mar 13 15:01:00 2004
+++ php-src/NEWSSun Mar 14 16:21:21 2004
@@ -1,6 +1,26 @@
 PHPNEWS
 |||
 ?? March 2004, PHP 5 Release Candidate 1
+- Added support for PHP 4 style object comparisons which is enabled in
+  ze1_compatiblity_mode. (Andi)
+- Added support for PHP 4 style object conversion to long, double, and boolean
+  values which is enabled in ze1_compatibility_mode. (Andi, Stas)
+- Allow objector oriented extensions to overload comparison functions and other
+  operations. Solves problems using SimpleXML values. (Andi, Zeev)
+- Fixed crash when accessing a class constant with a value which in turn is
+  also a constant. (Dmitry)
+- Fixed object's truth value conversion. It is always true unless
+  ze1_compatibility_mode is on in which it behaves like in PHP 4. (Stas)
+- Improve out of memory handling in new memory manager. (Stas)
+- Fixed crash when an object reference itself during destructor call. (Andi)
+- Fixed crash in foreach() when iterating over object properties or a method's
+  return values. (Andi)
+- Fixed crash when an exception is thrown in a destructor. Such exceptions are
+  now ignored as destruction happens out of context at no definite time. (Andi)
+- Fixed crashes in exception handling. (Dmitry, Andi)
+- Changed prototype checks so that they aren't done on constructors. (Andi)
+- Changed prototype checks to output an E_STRICT message instead of
+  an E_COMPILE_ERROR. (Andi)
 - Changed Iterator::has_more() to Iterator::valid(). (Marcus)
 - Upgraded bundled oniguruma library to version 2.2.2. (Rui, Moriyoshi)
 - Added mb_list_encoding() to return an array with all mbstring supported
@@ -21,6 +41,9 @@
 - Fixed problem preventing startup errors from being displayed. (Marcus)
 - Fixed start-up problem if both SPL and SimpleXML were enabled. The double
   initialization of apache 1.3 was causing problems here. (Marcus, Derick)
+- Fixed bug #27504 (Visibility bugs in call_user_function()). (Dmitry)
+- Fixed bug #27123 (Fix crash caused by bug in get_object_vars()). (Andi)
+- Fixed bug #27535 (Problem with object freeing mechanism). (Dmitry)
 - Fixed bug #27586 (ArrayObject::getIterator crashes with [] assignment). 
   (Marcus)
 - Fixed bug #27537 (Objects pointing to each other segfaults). (Dmitry)

-- 
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

2004-03-14 Thread Ilia Alshanetsky
iliaa   Sun Mar 14 15:12:19 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.593&r2=1.1247.2.594&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.593 php-src/NEWS:1.1247.2.594
--- php-src/NEWS:1.1247.2.593   Sun Mar 14 05:45:51 2004
+++ php-src/NEWSSun Mar 14 15:12:17 2004
@@ -3,6 +3,8 @@
 ?? Feb 2004, Version 4.3.5
 - Fixed possible crashes inside socket extension, due to missing check inside
   allocation functions. (Ilia)
+- Fixed bug #27590 (crash during shutdown when freeing persistent resources
+  in ZTS mode). (Ilia)
 - Fixed bug #27582 (possible crashes in imagefilltoborder()). (Pierre)
 - Fixed bug #27530 (broken http auth when safe_mode is on and PCRE is
   disabled). (Ilia)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src /ext/sockets sockets.c

2004-03-14 Thread Jan Lehnardt
jan Sun Mar 14 12:53:29 2004 EDT

  Modified files:  
/php-src/ext/socketssockets.c 
  Log:
   - improve error message
  
  
http://cvs.php.net/diff.php/php-src/ext/sockets/sockets.c?r1=1.160&r2=1.161&ty=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.160 php-src/ext/sockets/sockets.c:1.161
--- php-src/ext/sockets/sockets.c:1.160 Sun Mar 14 06:42:17 2004
+++ php-src/ext/sockets/sockets.c   Sun Mar 14 12:53:28 2004
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: sockets.c,v 1.160 2004/03/14 11:42:17 msopacua Exp $ */
+/* $Id: sockets.c,v 1.161 2004/03/14 17:53:28 jan Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -384,7 +384,7 @@
 
 #else
/* No IPv6 specific hostname resolution is available on this system? */
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, "Host lookup failed: 
getaddrinfo() not available on system.");
+   php_error_docref(NULL TSRMLS_CC, E_WARNING, "Host lookup failed: 
getaddrinfo() not available on this system.");
return 0;
 #endif
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src / cvsclean /build build.mk

2004-03-14 Thread Sascha Schumann
sas Sun Mar 14 12:44:37 2004 EDT

  Modified files:  
/php-src/build  build.mk 
/php-srccvsclean 
  Log:
  Renaming cvsclean target; IRIX make seems to ignore .PHONY
  
  
http://cvs.php.net/diff.php/php-src/build/build.mk?r1=1.24&r2=1.25&ty=u
Index: php-src/build/build.mk
diff -u php-src/build/build.mk:1.24 php-src/build/build.mk:1.25
--- php-src/build/build.mk:1.24 Tue Feb  3 03:23:40 2004
+++ php-src/build/build.mk  Sun Mar 14 12:44:36 2004
@@ -14,7 +14,7 @@
 #  | Author: Sascha Schumann <[EMAIL PROTECTED]> |
 #  +--+
 #
-# $Id: build.mk,v 1.24 2004/02/03 08:23:40 martin Exp $ 
+# $Id: build.mk,v 1.25 2004/03/14 17:44:36 sas Exp $ 
 #
 #
 # Makefile to generate build tools
@@ -65,10 +65,9 @@
md5sum $$distname.tar.bz2; \
bzip2 -t $$distname.tar.bz2
 
-cvsclean:
+cvsclean-work:
@for i in `find . -name .cvsignore`; do \
(cd `dirname $$i` 2>/dev/null && rm -rf `cat .cvsignore | grep -v 
config.nice` *.o *.a .libs || true); \
done
 
-.PHONY: $(ALWAYS) snapshot cvsclean
-.PRECIOUS: cvsclean
+.PHONY: $(ALWAYS) snapshot
http://cvs.php.net/diff.php/php-src/cvsclean?r1=1.1&r2=1.2&ty=u
Index: php-src/cvsclean
diff -u php-src/cvsclean:1.1 php-src/cvsclean:1.2
--- php-src/cvsclean:1.1Mon Mar  6 11:02:01 2000
+++ php-src/cvscleanSun Mar 14 12:44:36 2004
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-${MAKE:-make} -f build/build.mk cvsclean
+${MAKE:-make} -f build/build.mk cvsclean-work

-- 
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) / cvsclean /build build.mk

2004-03-14 Thread Sascha Schumann
sas Sun Mar 14 12:43:47 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-src/build  build.mk 
/php-srccvsclean 
  Log:
  Renaming cvsclean target -- IRIX make seems to ignore the .PHONY target.
  
  
http://cvs.php.net/diff.php/php-src/build/build.mk?r1=1.18&r2=1.18.2.1&ty=u
Index: php-src/build/build.mk
diff -u php-src/build/build.mk:1.18 php-src/build/build.mk:1.18.2.1
--- php-src/build/build.mk:1.18 Mon Oct 21 11:11:19 2002
+++ php-src/build/build.mk  Sun Mar 14 12:43:44 2004
@@ -14,7 +14,7 @@
 #  | Author: Sascha Schumann <[EMAIL PROTECTED]> |
 #  +--+
 #
-# $Id: build.mk,v 1.18 2002/10/21 15:11:19 hholzgra Exp $ 
+# $Id: build.mk,v 1.18.2.1 2004/03/14 17:43:44 sas Exp $ 
 #
 #
 # Makefile to generate build tools
@@ -65,7 +65,7 @@
md5sum $$distname.tar.bz2; \
bzip2 -t $$distname.tar.bz2
 
-cvsclean:
+cvsclean-work:
@for i in `find . -name .cvsignore`; do \
(cd `dirname $$i` 2>/dev/null && rm -rf `cat .cvsignore | grep -v 
config.nice` *.o *.a .libs || true); \
done
http://cvs.php.net/diff.php/php-src/cvsclean?r1=1.1&r2=1.1.16.1&ty=u
Index: php-src/cvsclean
diff -u php-src/cvsclean:1.1 php-src/cvsclean:1.1.16.1
--- php-src/cvsclean:1.1Mon Mar  6 11:02:01 2000
+++ php-src/cvscleanSun Mar 14 12:43:46 2004
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-${MAKE:-make} -f build/build.mk cvsclean
+${MAKE:-make} -f build/build.mk cvsclean-work

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src /ext/simplexml/tests 020.phpt

2004-03-14 Thread Marcus Boerger
helly   Sun Mar 14 10:33:16 2004 EDT

  Added files: 
/php-src/ext/simplexml/tests020.phpt 
  Log:
  Add new test
  
  

http://cvs.php.net/co.php/php-src/ext/simplexml/tests/020.phpt?r=1.1&p=1
Index: php-src/ext/simplexml/tests/020.phpt
+++ php-src/ext/simplexml/tests/020.phpt
--TEST--
SimpleXML attribute compared to string
--SKIPIF--
 
--FILE--
bar');
print $doc->name["attr"];
print "\n";
if ($doc->name["attr"] == "foo") {
 print "Works\n";
} else {
 print "Error\n";
}
?>
===DONE===
--EXPECT--
foo
Works
===DONE===

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src /ext/sockets sockets.c

2004-03-14 Thread Melvyn Sopacua
msopacuaSun Mar 14 06:42:18 2004 EDT

  Modified files:  
/php-src/ext/socketssockets.c 
  Log:
  Fix a typo, dating back from 1.145.
  
  
  
http://cvs.php.net/diff.php/php-src/ext/sockets/sockets.c?r1=1.159&r2=1.160&ty=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.159 php-src/ext/sockets/sockets.c:1.160
--- php-src/ext/sockets/sockets.c:1.159 Wed Feb 25 17:10:09 2004
+++ php-src/ext/sockets/sockets.c   Sun Mar 14 06:42:17 2004
@@ -19,7 +19,7 @@
+--+
  */
 
-/* $Id: sockets.c,v 1.159 2004/02/25 22:10:09 iliaa Exp $ */
+/* $Id: sockets.c,v 1.160 2004/03/14 11:42:17 msopacua Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -385,7 +385,7 @@
 #else
/* No IPv6 specific hostname resolution is available on this system? */
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Host lookup failed: 
getaddrinfo() not available on system.");
-   reurn 0;
+   return 0;
 #endif
 
}

-- 
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

2004-03-14 Thread Jani Taskinen
sniper  Sun Mar 14 05:45:53 2004 EDT

  Modified files:  (Branch: PHP_4_3)
/php-srcNEWS 
  Log:
  reorder
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.592&r2=1.1247.2.593&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.592 php-src/NEWS:1.1247.2.593
--- php-src/NEWS:1.1247.2.592   Sat Mar 13 18:41:00 2004
+++ php-src/NEWSSun Mar 14 05:45:51 2004
@@ -1,9 +1,9 @@
 PHP 4  NEWS
 |||
 ?? Feb 2004, Version 4.3.5
-- Fixed bug #27582 (possible crashes inside imagefilltoborder()). (Pierre)
 - Fixed possible crashes inside socket extension, due to missing check inside
   allocation functions. (Ilia)
+- Fixed bug #27582 (possible crashes in imagefilltoborder()). (Pierre)
 - Fixed bug #27530 (broken http auth when safe_mode is on and PCRE is
   disabled). (Ilia)
 - Fixed bug #27509 (broken getaddrinfo() causes fsockopen() error). (Sara)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php