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

2008-09-10 Thread Antony Dovgal 
tony2001Wed Sep 10 07:31:12 2008 UTC

  Modified files:  
/php-src/ext/mcrypt mcrypt.c 
  Log:
  check for NULL before freeing
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/mcrypt.c?r1=1.115r2=1.116diff_format=u
Index: php-src/ext/mcrypt/mcrypt.c
diff -u php-src/ext/mcrypt/mcrypt.c:1.115 php-src/ext/mcrypt/mcrypt.c:1.116
--- php-src/ext/mcrypt/mcrypt.c:1.115   Sun Sep  7 22:53:20 2008
+++ php-src/ext/mcrypt/mcrypt.c Wed Sep 10 07:31:12 2008
@@ -16,7 +16,7 @@
|  Derick Rethans [EMAIL PROTECTED]|
+--+
  */
-/* $Id: mcrypt.c,v 1.115 2008/09/07 22:53:20 felipe Exp $ */
+/* $Id: mcrypt.c,v 1.116 2008/09/10 07:31:12 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1275,7 +1275,7 @@
 int php_mcrypt_func(php_mcrypt_op op, char *cipher, char *mode, char *key_str, 
int key_len, char *iv_str, int iv_len, char *data_str, int data_len, char 
**data_copy, int *data_size TSRMLS_DC)
 {
MCRYPT td;
-   char *cipher_dir_string, *module_dir_string, *key_copy, *iv_copy;
+   char *cipher_dir_string, *module_dir_string, *key_copy, *iv_copy = NULL;
int i, status = SUCCESS, count, *key_sizes, key_size, iv_size, 
block_size;

MCRYPT_GET_INI
@@ -1362,7 +1362,9 @@
}

efree(key_copy);
-   efree(iv_copy);
+   if (iv_copy) {
+   efree(iv_copy);
+   }

return status;
 }



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

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS

2008-09-10 Thread Arnaud Le Blanc 
lbarnaudWed Sep 10 10:28:57 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
  Log:
  BFN
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.312r2=1.2027.2.547.2.965.2.313diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.312 
php-src/NEWS:1.2027.2.547.2.965.2.313
--- php-src/NEWS:1.2027.2.547.2.965.2.312   Tue Sep  9 13:26:40 2008
+++ php-src/NEWSWed Sep 10 10:28:57 2008
@@ -5,6 +5,8 @@
 - Changed error level E_ERROR into E_WARNING in Soap extension methods 
   parameter validation. (Felipe)
 
+- Fixed bug #45928 (large scripts from stdin are stripped at 16K border).
+  (Christian Schneider, Arnaud)
 - Fixed bug #45911 (Cannot disable ext/hash). (Arnaud)
 
 02 Sep 2008, PHP 5.3.0 Alpha 2



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

[PHP-CVS] cvs: php-src /tests/basic bug20539.phpt

2008-09-10 Thread Arnaud Le Blanc 
lbarnaudWed Sep 10 11:12:12 2008 UTC

  Modified files:  
/php-src/tests/basicbug20539.phpt 
  Log:
  Fix test
  
  
http://cvs.php.net/viewvc.cgi/php-src/tests/basic/bug20539.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/tests/basic/bug20539.phpt
diff -u php-src/tests/basic/bug20539.phpt:1.4 
php-src/tests/basic/bug20539.phpt:1.5
--- php-src/tests/basic/bug20539.phpt:1.4   Thu Aug 14 21:53:53 2008
+++ php-src/tests/basic/bug20539.phpt   Wed Sep 10 11:12:12 2008
@@ -1,5 +1,7 @@
 --TEST--
 Bug #20539 (PHP CLI Segmentation Fault)
+--SKIPIF--
+?php if (!extension_loaded(session)) die(skip session extension not 
available); ?
 --INI--
 session.auto_start=1
 session.save_handler=files



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

[PHP-CVS] cvs: php-src(PHP_5_3) /tests/basic bug20539.phpt

2008-09-10 Thread Arnaud Le Blanc 
lbarnaudWed Sep 10 11:12:25 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/tests/basicbug20539.phpt 
  Log:
  MFH: Fix test
  
  
http://cvs.php.net/viewvc.cgi/php-src/tests/basic/bug20539.phpt?r1=1.3.6.1r2=1.3.6.2diff_format=u
Index: php-src/tests/basic/bug20539.phpt
diff -u php-src/tests/basic/bug20539.phpt:1.3.6.1 
php-src/tests/basic/bug20539.phpt:1.3.6.2
--- php-src/tests/basic/bug20539.phpt:1.3.6.1   Thu Aug 14 21:54:01 2008
+++ php-src/tests/basic/bug20539.phpt   Wed Sep 10 11:12:25 2008
@@ -1,5 +1,7 @@
 --TEST--
 Bug #20539 (PHP CLI Segmentation Fault)
+--SKIPIF--
+?php if (!extension_loaded(session)) die(skip session extension not 
available); ?
 --INI--
 session.auto_start=1
 session.save_handler=files



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

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

2008-09-10 Thread Rob Richards 
rrichards   Wed Sep 10 11:20:35 2008 UTC

  Added files: 
/php-src/ext/simplexml/testsbug45553.phpt 

  Modified files:  
/php-src/ext/simplexml  simplexml.c 
  Log:
  fix bug #45553 (Using XPath for attributes with a namespace does not work)
  add test
  
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.258r2=1.259diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.258 
php-src/ext/simplexml/simplexml.c:1.259
--- php-src/ext/simplexml/simplexml.c:1.258 Fri Aug  8 22:06:42 2008
+++ php-src/ext/simplexml/simplexml.c   Wed Sep 10 11:20:35 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: simplexml.c,v 1.258 2008/08/08 22:06:42 colder Exp $ */
+/* $Id: simplexml.c,v 1.259 2008/09/10 11:20:35 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1287,7 +1287,7 @@
if (nodeptr-type == XML_TEXT_NODE) {
_node_as_zval(sxe, nodeptr-parent, value, 
SXE_ITER_NONE, NULL, NULL, 0 TSRMLS_CC);
} else if (nodeptr-type == XML_ATTRIBUTE_NODE) {
-   _node_as_zval(sxe, nodeptr-parent, value, 
SXE_ITER_ATTRLIST, (char *)nodeptr-name, NULL, 0 TSRMLS_CC);
+   _node_as_zval(sxe, nodeptr-parent, value, 
SXE_ITER_ATTRLIST, (char*)nodeptr-name, nodeptr-ns ? nodeptr-ns-href : 
NULL, 0 TSRMLS_CC);
} else {
_node_as_zval(sxe, nodeptr, value, 
SXE_ITER_NONE, NULL, NULL, 0 TSRMLS_CC);
}
@@ -2640,7 +2640,7 @@
 {
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
-   php_info_print_table_row(2, Revision, $Revision: 1.258 $);
+   php_info_print_table_row(2, Revision, $Revision: 1.259 $);
php_info_print_table_row(2, Schema support,
 #ifdef LIBXML_SCHEMAS_ENABLED
enabled);

http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug45553.phpt?view=markuprev=1.1
Index: php-src/ext/simplexml/tests/bug45553.phpt
+++ php-src/ext/simplexml/tests/bug45553.phpt
--TEST--
Bug #45553 (Using XPath to return values for attributes with a namespace does 
not work)
--FILE--
?php
$xml =XML
xml xmlns:a=http://a;
data a:label=I am A label=I am Nothingtest1/data
a:data a:label=I am a:A label=I am a:Nothingtest2/a:data
/xml
XML;

$x = simplexml_load_string($xml);
$x-registerXPathNamespace(a, http://a;);

$atts = $x-xpath(/xml/data/@a:label);
echo $atts[0] . \n;
$atts = $x-xpath(/xml/a:data);
echo $atts[0]-attributes() . \n;
$atts = $x-xpath(/xml/a:data/@a:label);
echo $atts[0] . \n;
$atts = $x-xpath(/xml/a:data/@label);
echo $atts[0] . \n;
$atts = $x-xpath(/xml/data/@label);
echo $atts[0] . \n;
?
--EXPECTF--
I am A
I am a:Nothing
I am a:A
I am a:Nothing
I am Nothing


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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/simplexml simplexml.c /ext/simplexml/tests bug45553.phpt

2008-09-10 Thread Rob Richards 
rrichards   Wed Sep 10 11:21:12 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/simplexml/testsbug45553.phpt 

  Modified files:  
/php-src/ext/simplexml  simplexml.c 
  Log:
  MFH: fix bug #45553 (Using XPath for attributes with a namespace does not 
work)
  add test
  
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.35.2.17r2=1.151.2.22.2.35.2.18diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.17 
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.18
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.17  Fri Aug  8 
22:07:07 2008
+++ php-src/ext/simplexml/simplexml.c   Wed Sep 10 11:21:12 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: simplexml.c,v 1.151.2.22.2.35.2.17 2008/08/08 22:07:07 colder Exp $ */
+/* $Id: simplexml.c,v 1.151.2.22.2.35.2.18 2008/09/10 11:21:12 rrichards Exp $ 
*/
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1270,7 +1270,7 @@
if (nodeptr-type == XML_TEXT_NODE) {
_node_as_zval(sxe, nodeptr-parent, value, 
SXE_ITER_NONE, NULL, NULL, 0 TSRMLS_CC);
} else if (nodeptr-type == XML_ATTRIBUTE_NODE) {
-   _node_as_zval(sxe, nodeptr-parent, value, 
SXE_ITER_ATTRLIST, (char*)nodeptr-name, NULL, 0 TSRMLS_CC);
+   _node_as_zval(sxe, nodeptr-parent, value, 
SXE_ITER_ATTRLIST, (char*)nodeptr-name, nodeptr-ns ? nodeptr-ns-href : 
NULL, 0 TSRMLS_CC);
} else {
_node_as_zval(sxe, nodeptr, value, 
SXE_ITER_NONE, NULL, NULL, 0 TSRMLS_CC);
}
@@ -2558,7 +2558,7 @@
 {
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
-   php_info_print_table_row(2, Revision, $Revision: 
1.151.2.22.2.35.2.17 $);
+   php_info_print_table_row(2, Revision, $Revision: 
1.151.2.22.2.35.2.18 $);
php_info_print_table_row(2, Schema support,
 #ifdef LIBXML_SCHEMAS_ENABLED
enabled);

http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug45553.phpt?view=markuprev=1.1
Index: php-src/ext/simplexml/tests/bug45553.phpt
+++ php-src/ext/simplexml/tests/bug45553.phpt
--TEST--
Bug #45553 (Using XPath to return values for attributes with a namespace does 
not work)
--FILE--
?php
$xml =XML
xml xmlns:a=http://a;
data a:label=I am A label=I am Nothingtest1/data
a:data a:label=I am a:A label=I am a:Nothingtest2/a:data
/xml
XML;

$x = simplexml_load_string($xml);
$x-registerXPathNamespace(a, http://a;);

$atts = $x-xpath(/xml/data/@a:label);
echo $atts[0] . \n;
$atts = $x-xpath(/xml/a:data);
echo $atts[0]-attributes() . \n;
$atts = $x-xpath(/xml/a:data/@a:label);
echo $atts[0] . \n;
$atts = $x-xpath(/xml/a:data/@label);
echo $atts[0] . \n;
$atts = $x-xpath(/xml/data/@label);
echo $atts[0] . \n;
?
--EXPECTF--
I am A
I am a:Nothing
I am a:A
I am a:Nothing
I am Nothing


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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/simplexml simplexml.c /ext/simplexml/tests bug45553.phpt

2008-09-10 Thread Rob Richards 
rrichards   Wed Sep 10 11:21:49 2008 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/simplexml/testsbug45553.phpt 

  Modified files:  
/php-src/ext/simplexml  simplexml.c 
  Log:
  MFH: fix bug #45553 (Using XPath for attributes with a namespace does not 
work)
  add test
  
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.41r2=1.151.2.22.2.42diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.41 
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.42
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.41   Fri May 23 15:46:54 2008
+++ php-src/ext/simplexml/simplexml.c   Wed Sep 10 11:21:48 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: simplexml.c,v 1.151.2.22.2.41 2008/05/23 15:46:54 iliaa Exp $ */
+/* $Id: simplexml.c,v 1.151.2.22.2.42 2008/09/10 11:21:48 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1229,7 +1229,7 @@
if (nodeptr-type == XML_TEXT_NODE) {
_node_as_zval(sxe, nodeptr-parent, value, 
SXE_ITER_NONE, NULL, NULL, 0 TSRMLS_CC);
} else if (nodeptr-type == XML_ATTRIBUTE_NODE) {
-   _node_as_zval(sxe, nodeptr-parent, value, 
SXE_ITER_ATTRLIST, (char*)nodeptr-name, NULL, 0 TSRMLS_CC);
+   _node_as_zval(sxe, nodeptr-parent, value, 
SXE_ITER_ATTRLIST, (char*)nodeptr-name, nodeptr-ns ? nodeptr-ns-href : 
NULL, 0 TSRMLS_CC);
} else {
_node_as_zval(sxe, nodeptr, value, 
SXE_ITER_NONE, NULL, NULL, 0 TSRMLS_CC);
}
@@ -2446,7 +2446,7 @@
 {
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
-   php_info_print_table_row(2, Revision, $Revision: 1.151.2.22.2.41 $);
+   php_info_print_table_row(2, Revision, $Revision: 1.151.2.22.2.42 $);
php_info_print_table_row(2, Schema support,
 #ifdef LIBXML_SCHEMAS_ENABLED
enabled);

http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug45553.phpt?view=markuprev=1.1
Index: php-src/ext/simplexml/tests/bug45553.phpt
+++ php-src/ext/simplexml/tests/bug45553.phpt
--TEST--
Bug #45553 (Using XPath to return values for attributes with a namespace does 
not work)
--FILE--
?php
$xml =XML
xml xmlns:a=http://a;
data a:label=I am A label=I am Nothingtest1/data
a:data a:label=I am a:A label=I am a:Nothingtest2/a:data
/xml
XML;

$x = simplexml_load_string($xml);
$x-registerXPathNamespace(a, http://a;);

$atts = $x-xpath(/xml/data/@a:label);
echo $atts[0] . \n;
$atts = $x-xpath(/xml/a:data);
echo $atts[0]-attributes() . \n;
$atts = $x-xpath(/xml/a:data/@a:label);
echo $atts[0] . \n;
$atts = $x-xpath(/xml/a:data/@label);
echo $atts[0] . \n;
$atts = $x-xpath(/xml/data/@label);
echo $atts[0] . \n;
?
--EXPECTF--
I am A
I am a:Nothing
I am a:A
I am a:Nothing
I am Nothing


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

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS

2008-09-10 Thread Rob Richards 
rrichards   Wed Sep 10 11:22:41 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  BFN
  fix order
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1218r2=1.2027.2.547.2.1219diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1218 php-src/NEWS:1.2027.2.547.2.1219
--- php-src/NEWS:1.2027.2.547.2.1218Wed Sep 10 00:20:49 2008
+++ php-src/NEWSWed Sep 10 11:22:40 2008
@@ -18,12 +18,9 @@
   (Scott)
 - Fixed a crash on invalid method in ReflectionParameter constructor.
   (Christian Seiler)
-
 - Fixed bug #46031 (Segfault in AppendIterator::next). (Arnaud)
 - Fixed bug #46010 (warnings incorrectly generated for iv in ecb mode). 
   (Felipe)
-- Fixed bug #45405 (snmp extension memory leak). (Federico Cuello, Rodrigo
-  Campos)
 - Fixed bug #45956 (parse_ini_file() does not return false with syntax errors
   in parsed file). (Jani)
 - Fixed bug #45862 (get_class_vars is inconsistent with 'protected' and 
@@ -45,6 +42,8 @@
 - Fixed bug #45556 (Return value from callback isn't freed). (Felipe)
 - Fixed bug #4 (Segfault with invalid non-string as 
   register_introspection_callback). (Christian Seiler)
+- Fixed bug #45553 (Using XPath to return values for attributes with a 
+  namespace does not work). (Rob)
 - Fixed bug #45486 (mb_send_mail(); header 'Content-Type: text/plain; 
charset=' 
   parsing incorrect). (Felipe)
 - Fixed bug #45485 (strip_tags and ?XML tag). (Felipe)
@@ -56,6 +55,8 @@
   before shutdown) (basant dot kukreja at sun dot com)
 - Fixed bug #45406 (session.serialize_handler declared by shared extension 
   fails). (Kalle, oleg dot grenrus at dynamoid dot com)
+- Fixed bug #45405 (snmp extension memory leak). (Federico Cuello, Rodrigo
+  Campos)
 - Fixed bug #45392 (ob_start()/ob_end_clean() and memory_limit). (Arnaud)
 - Fixed bug #45352 (Segmentation fault because of tick function on second
   request). (Dmitry)



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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/readline readline.c

2008-09-10 Thread Felipe Pena 
felipe  Wed Sep 10 13:48:14 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/readline   readline.c 
  Log:
  - MFB: Fixed mem. leak
  
http://cvs.php.net/viewvc.cgi/php-src/ext/readline/readline.c?r1=1.42.2.3.2.4r2=1.42.2.3.2.5diff_format=u
Index: php-src/ext/readline/readline.c
diff -u php-src/ext/readline/readline.c:1.42.2.3.2.4 
php-src/ext/readline/readline.c:1.42.2.3.2.5
--- php-src/ext/readline/readline.c:1.42.2.3.2.4Mon Dec 31 07:20:10 2007
+++ php-src/ext/readline/readline.c Wed Sep 10 13:48:14 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: readline.c,v 1.42.2.3.2.4 2007/12/31 07:20:10 sebastian Exp $ */
+/* $Id: readline.c,v 1.42.2.3.2.5 2008/09/10 13:48:14 felipe Exp $ */
 
 /* {{{ includes  prototypes */
 
@@ -504,6 +504,7 @@
 
if (!zend_is_callable(callback, 0, name)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, %s is not 
callable, name);
+   efree(name);
RETURN_FALSE;
}
 



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

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/odbc php_odbc.c php_odbc_includes.h

2008-09-10 Thread Patrick van Kleef 

Hi Hannes,



iodbc   Fri Aug 29 19:16:58 2008 UTC

 Modified files:  (Branch: PHP_5_3)
   /php-src/ext/odbc   php_odbc.c php_odbc_includes.h
 Log:
 - MFH: Added odbc.default_cursortype to control the ODBC cursormodel
   (bug #43668)


It would greatly simplify things for those of us without odbc setup if
you could mention which constant is the default value =)



Apologies, i thought the default was stated in the bug report.

The code defaults to a static cursor.

I will add a comment in CVS about this too.


Patrick

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

[PHP-CVS] cvs: php-src /main php_variables.c

2008-09-10 Thread Arnaud Le Blanc 
lbarnaudWed Sep 10 14:12:55 2008 UTC

  Modified files:  
/php-src/main   php_variables.c 
  Log:
  Fix php_u_register_variable_ex(), avoid readding some uninitialized data
  after the end of the variable name
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/php_variables.c?r1=1.149r2=1.150diff_format=u
Index: php-src/main/php_variables.c
diff -u php-src/main/php_variables.c:1.149 php-src/main/php_variables.c:1.150
--- php-src/main/php_variables.c:1.149  Sat Aug 30 18:28:48 2008
+++ php-src/main/php_variables.cWed Sep 10 14:12:55 2008
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: php_variables.c,v 1.149 2008/08/30 18:28:48 rasmus Exp $ */
+/* $Id: php_variables.c,v 1.150 2008/09/10 14:12:55 lbarnaud Exp $ */
 
 #include stdio.h
 #include php.h
@@ -361,7 +361,7 @@
is_array = 1;
*ip = 0;
} else {
-   is_array = 0;
+   goto plain_var;
}
}
} else {



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

[PHP-CVS] cvs: php-src /ext/dom cdatasection.c comment.c documentfragment.c processinginstruction.c text.c

2008-09-10 Thread Rob Richards 
rrichards   Wed Sep 10 15:39:44 2008 UTC

  Modified files:  
/php-src/ext/domcdatasection.c comment.c documentfragment.c 
processinginstruction.c text.c 
  Log:
  fix bug #46029 (Segfault in DOMText when using with Reflection)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/cdatasection.c?r1=1.22r2=1.23diff_format=u
Index: php-src/ext/dom/cdatasection.c
diff -u php-src/ext/dom/cdatasection.c:1.22 php-src/ext/dom/cdatasection.c:1.23
--- php-src/ext/dom/cdatasection.c:1.22 Thu Aug 14 08:38:36 2008
+++ php-src/ext/dom/cdatasection.c  Wed Sep 10 15:39:43 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: cdatasection.c,v 1.22 2008/08/14 08:38:36 tony2001 Exp $ */
+/* $Id: cdatasection.c,v 1.23 2008/09/10 15:39:43 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -72,7 +72,7 @@
 
intern = (dom_object *)zend_object_store_get_object(id TSRMLS_CC);
if (intern != NULL) {
-   oldnode = (xmlNodePtr)intern-ptr;
+   oldnode = dom_object_get_node(intern);
if (oldnode != NULL) {
php_libxml_node_free_resource(oldnode  TSRMLS_CC);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/comment.c?r1=1.22r2=1.23diff_format=u
Index: php-src/ext/dom/comment.c
diff -u php-src/ext/dom/comment.c:1.22 php-src/ext/dom/comment.c:1.23
--- php-src/ext/dom/comment.c:1.22  Thu Aug 14 08:38:37 2008
+++ php-src/ext/dom/comment.c   Wed Sep 10 15:39:43 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: comment.c,v 1.22 2008/08/14 08:38:37 tony2001 Exp $ */
+/* $Id: comment.c,v 1.23 2008/09/10 15:39:43 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -72,7 +72,7 @@
 
intern = (dom_object *)zend_object_store_get_object(id TSRMLS_CC);
if (intern != NULL) {
-   oldnode = (xmlNodePtr)intern-ptr;
+   oldnode = dom_object_get_node(intern);
if (oldnode != NULL) {
php_libxml_node_free_resource(oldnode  TSRMLS_CC);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/documentfragment.c?r1=1.26r2=1.27diff_format=u
Index: php-src/ext/dom/documentfragment.c
diff -u php-src/ext/dom/documentfragment.c:1.26 
php-src/ext/dom/documentfragment.c:1.27
--- php-src/ext/dom/documentfragment.c:1.26 Thu Aug 14 08:38:37 2008
+++ php-src/ext/dom/documentfragment.c  Wed Sep 10 15:39:43 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: documentfragment.c,v 1.26 2008/08/14 08:38:37 tony2001 Exp $ */
+/* $Id: documentfragment.c,v 1.27 2008/09/10 15:39:43 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -75,7 +75,7 @@
 
intern = (dom_object *)zend_object_store_get_object(id TSRMLS_CC);
if (intern != NULL) {
-   oldnode = (xmlNodePtr)intern-ptr;
+   oldnode = dom_object_get_node(intern);
if (oldnode != NULL) {
php_libxml_node_free_resource(oldnode  TSRMLS_CC);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/processinginstruction.c?r1=1.29r2=1.30diff_format=u
Index: php-src/ext/dom/processinginstruction.c
diff -u php-src/ext/dom/processinginstruction.c:1.29 
php-src/ext/dom/processinginstruction.c:1.30
--- php-src/ext/dom/processinginstruction.c:1.29Thu Aug 14 08:38:37 2008
+++ php-src/ext/dom/processinginstruction.c Wed Sep 10 15:39:43 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: processinginstruction.c,v 1.29 2008/08/14 08:38:37 tony2001 Exp $ */
+/* $Id: processinginstruction.c,v 1.30 2008/09/10 15:39:43 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -79,7 +79,7 @@
 
intern = (dom_object *)zend_object_store_get_object(id TSRMLS_CC);
if (intern != NULL) {
-   oldnode = (xmlNodePtr)intern-ptr;
+   oldnode = dom_object_get_node(intern);
if (oldnode != NULL) {
php_libxml_node_free_resource(oldnode  TSRMLS_CC);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/text.c?r1=1.38r2=1.39diff_format=u
Index: php-src/ext/dom/text.c
diff -u php-src/ext/dom/text.c:1.38 php-src/ext/dom/text.c:1.39
--- php-src/ext/dom/text.c:1.38 Thu Aug 14 08:38:37 2008
+++ php-src/ext/dom/text.c  Wed Sep 10 15:39:43 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: text.c,v 1.38 2008/08/14 08:38:37 tony2001 Exp $ */
+/* $Id: text.c,v 1.39 2008/09/10 15:39:43 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -91,7 +91,7 @@
 
intern = (dom_object *)zend_object_store_get_object(id TSRMLS_CC);
if (intern != NULL) {
-   oldnode =

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/dom cdatasection.c comment.c documentfragment.c processinginstruction.c text.c

2008-09-10 Thread Rob Richards 
rrichards   Wed Sep 10 15:40:11 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/domcdatasection.c comment.c documentfragment.c 
processinginstruction.c text.c 
  Log:
  MFH: fix bug #46029 (Segfault in DOMText when using with Reflection)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/cdatasection.c?r1=1.11.2.1.2.1.2.5r2=1.11.2.1.2.1.2.6diff_format=u
Index: php-src/ext/dom/cdatasection.c
diff -u php-src/ext/dom/cdatasection.c:1.11.2.1.2.1.2.5 
php-src/ext/dom/cdatasection.c:1.11.2.1.2.1.2.6
--- php-src/ext/dom/cdatasection.c:1.11.2.1.2.1.2.5 Thu Aug 14 08:39:04 2008
+++ php-src/ext/dom/cdatasection.c  Wed Sep 10 15:40:11 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: cdatasection.c,v 1.11.2.1.2.1.2.5 2008/08/14 08:39:04 tony2001 Exp $ */
+/* $Id: cdatasection.c,v 1.11.2.1.2.1.2.6 2008/09/10 15:40:11 rrichards Exp $ 
*/
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -73,7 +73,7 @@
 
intern = (dom_object *)zend_object_store_get_object(id TSRMLS_CC);
if (intern != NULL) {
-   oldnode = (xmlNodePtr)intern-ptr;
+   oldnode = dom_object_get_node(intern);
if (oldnode != NULL) {
php_libxml_node_free_resource(oldnode  TSRMLS_CC);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/comment.c?r1=1.11.2.1.2.1.2.5r2=1.11.2.1.2.1.2.6diff_format=u
Index: php-src/ext/dom/comment.c
diff -u php-src/ext/dom/comment.c:1.11.2.1.2.1.2.5 
php-src/ext/dom/comment.c:1.11.2.1.2.1.2.6
--- php-src/ext/dom/comment.c:1.11.2.1.2.1.2.5  Thu Aug 14 08:39:04 2008
+++ php-src/ext/dom/comment.c   Wed Sep 10 15:40:11 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: comment.c,v 1.11.2.1.2.1.2.5 2008/08/14 08:39:04 tony2001 Exp $ */
+/* $Id: comment.c,v 1.11.2.1.2.1.2.6 2008/09/10 15:40:11 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -73,7 +73,7 @@
 
intern = (dom_object *)zend_object_store_get_object(id TSRMLS_CC);
if (intern != NULL) {
-   oldnode = (xmlNodePtr)intern-ptr;
+   oldnode = dom_object_get_node(intern);
if (oldnode != NULL) {
php_libxml_node_free_resource(oldnode  TSRMLS_CC);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/documentfragment.c?r1=1.15.2.1.2.1.2.5r2=1.15.2.1.2.1.2.6diff_format=u
Index: php-src/ext/dom/documentfragment.c
diff -u php-src/ext/dom/documentfragment.c:1.15.2.1.2.1.2.5 
php-src/ext/dom/documentfragment.c:1.15.2.1.2.1.2.6
--- php-src/ext/dom/documentfragment.c:1.15.2.1.2.1.2.5 Thu Aug 14 08:39:04 2008
+++ php-src/ext/dom/documentfragment.c  Wed Sep 10 15:40:11 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: documentfragment.c,v 1.15.2.1.2.1.2.5 2008/08/14 08:39:04 tony2001 Exp 
$ */
+/* $Id: documentfragment.c,v 1.15.2.1.2.1.2.6 2008/09/10 15:40:11 rrichards 
Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -75,7 +75,7 @@
 
intern = (dom_object *)zend_object_store_get_object(id TSRMLS_CC);
if (intern != NULL) {
-   oldnode = (xmlNodePtr)intern-ptr;
+   oldnode = dom_object_get_node(intern);
if (oldnode != NULL) {
php_libxml_node_free_resource(oldnode  TSRMLS_CC);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/processinginstruction.c?r1=1.17.2.1.2.1.2.6r2=1.17.2.1.2.1.2.7diff_format=u
Index: php-src/ext/dom/processinginstruction.c
diff -u php-src/ext/dom/processinginstruction.c:1.17.2.1.2.1.2.6 
php-src/ext/dom/processinginstruction.c:1.17.2.1.2.1.2.7
--- php-src/ext/dom/processinginstruction.c:1.17.2.1.2.1.2.6Thu Aug 14 
08:39:05 2008
+++ php-src/ext/dom/processinginstruction.c Wed Sep 10 15:40:11 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: processinginstruction.c,v 1.17.2.1.2.1.2.6 2008/08/14 08:39:05 
tony2001 Exp $ */
+/* $Id: processinginstruction.c,v 1.17.2.1.2.1.2.7 2008/09/10 15:40:11 
rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -81,7 +81,7 @@
 
intern = (dom_object *)zend_object_store_get_object(id TSRMLS_CC);
if (intern != NULL) {
-   oldnode = (xmlNodePtr)intern-ptr;
+   oldnode = dom_object_get_node(intern);
if (oldnode != NULL) {
php_libxml_node_free_resource(oldnode  TSRMLS_CC);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/text.c?r1=1.23.2.1.2.4.2.5r2=1.23.2.1.2.4.2.6diff_format=u
Index: php-src/ext/dom/text.c
diff -u php-src/ext/dom/text.c:1.23.2.1.2.4.2.5 
php-src/ext/dom/text.c:1.23.2.1.2.4.2.6
--- php-src/ext/dom/text.c:1.23.2.1.2.4.2.5 Thu Aug 14 08:39:05 2008
+++ php-src/ext/dom/text.c  Wed Sep 10 15:40:11

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/dom cdatasection.c comment.c documentfragment.c processinginstruction.c text.c

2008-09-10 Thread Rob Richards 
rrichards   Wed Sep 10 15:40:34 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/domcdatasection.c comment.c documentfragment.c 
processinginstruction.c text.c 
  Log:
  MFH: fix bug #46029 (Segfault in DOMText when using with Reflection)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/cdatasection.c?r1=1.11.2.1.2.3r2=1.11.2.1.2.4diff_format=u
Index: php-src/ext/dom/cdatasection.c
diff -u php-src/ext/dom/cdatasection.c:1.11.2.1.2.3 
php-src/ext/dom/cdatasection.c:1.11.2.1.2.4
--- php-src/ext/dom/cdatasection.c:1.11.2.1.2.3 Mon Feb  4 15:23:10 2008
+++ php-src/ext/dom/cdatasection.c  Wed Sep 10 15:40:34 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: cdatasection.c,v 1.11.2.1.2.3 2008/02/04 15:23:10 sebastian Exp $ */
+/* $Id: cdatasection.c,v 1.11.2.1.2.4 2008/09/10 15:40:34 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -73,7 +73,7 @@
 
intern = (dom_object *)zend_object_store_get_object(id TSRMLS_CC);
if (intern != NULL) {
-   oldnode = (xmlNodePtr)intern-ptr;
+   oldnode = dom_object_get_node(intern);
if (oldnode != NULL) {
php_libxml_node_free_resource(oldnode  TSRMLS_CC);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/comment.c?r1=1.11.2.1.2.3r2=1.11.2.1.2.4diff_format=u
Index: php-src/ext/dom/comment.c
diff -u php-src/ext/dom/comment.c:1.11.2.1.2.3 
php-src/ext/dom/comment.c:1.11.2.1.2.4
--- php-src/ext/dom/comment.c:1.11.2.1.2.3  Mon Feb  4 15:23:10 2008
+++ php-src/ext/dom/comment.c   Wed Sep 10 15:40:34 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: comment.c,v 1.11.2.1.2.3 2008/02/04 15:23:10 sebastian Exp $ */
+/* $Id: comment.c,v 1.11.2.1.2.4 2008/09/10 15:40:34 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -73,7 +73,7 @@
 
intern = (dom_object *)zend_object_store_get_object(id TSRMLS_CC);
if (intern != NULL) {
-   oldnode = (xmlNodePtr)intern-ptr;
+   oldnode = dom_object_get_node(intern);
if (oldnode != NULL) {
php_libxml_node_free_resource(oldnode  TSRMLS_CC);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/documentfragment.c?r1=1.15.2.1.2.3r2=1.15.2.1.2.4diff_format=u
Index: php-src/ext/dom/documentfragment.c
diff -u php-src/ext/dom/documentfragment.c:1.15.2.1.2.3 
php-src/ext/dom/documentfragment.c:1.15.2.1.2.4
--- php-src/ext/dom/documentfragment.c:1.15.2.1.2.3 Mon Feb  4 15:23:10 2008
+++ php-src/ext/dom/documentfragment.c  Wed Sep 10 15:40:34 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: documentfragment.c,v 1.15.2.1.2.3 2008/02/04 15:23:10 sebastian Exp $ 
*/
+/* $Id: documentfragment.c,v 1.15.2.1.2.4 2008/09/10 15:40:34 rrichards Exp $ 
*/
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -76,7 +76,7 @@
 
intern = (dom_object *)zend_object_store_get_object(id TSRMLS_CC);
if (intern != NULL) {
-   oldnode = (xmlNodePtr)intern-ptr;
+   oldnode = dom_object_get_node(intern);
if (oldnode != NULL) {
php_libxml_node_free_resource(oldnode  TSRMLS_CC);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/processinginstruction.c?r1=1.17.2.1.2.3r2=1.17.2.1.2.4diff_format=u
Index: php-src/ext/dom/processinginstruction.c
diff -u php-src/ext/dom/processinginstruction.c:1.17.2.1.2.3 
php-src/ext/dom/processinginstruction.c:1.17.2.1.2.4
--- php-src/ext/dom/processinginstruction.c:1.17.2.1.2.3Mon Feb  4 
15:23:11 2008
+++ php-src/ext/dom/processinginstruction.c Wed Sep 10 15:40:34 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: processinginstruction.c,v 1.17.2.1.2.3 2008/02/04 15:23:11 sebastian 
Exp $ */
+/* $Id: processinginstruction.c,v 1.17.2.1.2.4 2008/09/10 15:40:34 rrichards 
Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -81,7 +81,7 @@
 
intern = (dom_object *)zend_object_store_get_object(id TSRMLS_CC);
if (intern != NULL) {
-   oldnode = (xmlNodePtr)intern-ptr;
+   oldnode = dom_object_get_node(intern);
if (oldnode != NULL) {
php_libxml_node_free_resource(oldnode  TSRMLS_CC);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/text.c?r1=1.23.2.1.2.6r2=1.23.2.1.2.7diff_format=u
Index: php-src/ext/dom/text.c
diff -u php-src/ext/dom/text.c:1.23.2.1.2.6 php-src/ext/dom/text.c:1.23.2.1.2.7
--- php-src/ext/dom/text.c:1.23.2.1.2.6 Mon Feb  4 15:23:11 2008
+++ php-src/ext/dom/text.c  Wed Sep 10 15:40:34 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: text.c,v

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS

2008-09-10 Thread Rob Richards 
rrichards   Wed Sep 10 15:41:04 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  BFN
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1220r2=1.2027.2.547.2.1221diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1220 php-src/NEWS:1.2027.2.547.2.1221
--- php-src/NEWS:1.2027.2.547.2.1220Wed Sep 10 13:26:38 2008
+++ php-src/NEWSWed Sep 10 15:41:04 2008
@@ -19,6 +19,7 @@
 - Fixed a crash on invalid method in ReflectionParameter constructor.
   (Christian Seiler)
 - Fixed bug #46031 (Segfault in AppendIterator::next). (Arnaud)
+- Fixed bug #46029 (Segfault in DOMText when using with Reflection). (Rob)
 - Fixed bug #46010 (warnings incorrectly generated for iv in ecb mode). 
   (Felipe)
 - Fixed bug #45956 (parse_ini_file() does not return false with syntax errors



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

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

2008-09-10 Thread Rob Richards 
rrichards   Wed Sep 10 16:28:20 2008 UTC

  Added files: 
/php-src/ext/simplexml/testsbug46003.phpt 

  Modified files:  
/php-src/ext/simplexml  simplexml.c 
  Log:
  fix bug #46003 (isset on nonexisting node return unexpected results)
  add test
  
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.259r2=1.260diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.259 
php-src/ext/simplexml/simplexml.c:1.260
--- php-src/ext/simplexml/simplexml.c:1.259 Wed Sep 10 11:20:35 2008
+++ php-src/ext/simplexml/simplexml.c   Wed Sep 10 16:28:20 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: simplexml.c,v 1.259 2008/09/10 11:20:35 rrichards Exp $ */
+/* $Id: simplexml.c,v 1.260 2008/09/10 16:28:20 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -829,7 +829,7 @@
while (node) {
xmlNodePtr nnext;
nnext = node-next;
-   if (!xmlStrcmp(node-name, (xmlChar 
*)Z_STRVAL_P(member))) {
+   if ((node-type == XML_ELEMENT_NODE)  
!xmlStrcmp(node-name, (xmlChar *)Z_STRVAL_P(member))) {
break;
}
node = nnext;
@@ -2640,7 +2640,7 @@
 {
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
-   php_info_print_table_row(2, Revision, $Revision: 1.259 $);
+   php_info_print_table_row(2, Revision, $Revision: 1.260 $);
php_info_print_table_row(2, Schema support,
 #ifdef LIBXML_SCHEMAS_ENABLED
enabled);

http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug46003.phpt?view=markuprev=1.1
Index: php-src/ext/simplexml/tests/bug46003.phpt
+++ php-src/ext/simplexml/tests/bug46003.phpt
--TEST--
Bug #46003 (isset on nonexisting nodes return unexpected results)
--FILE--
?php
$xml =XML
r
  pTest/p
  o d='h'
xx rr='info' /
yy rr='data' /
  /o
/r
XML;

$x = simplexml_load_string($xml);

var_dump(isset($x-p));
var_dump(isset($x-p-o));
var_dump(isset($x-o-yy));
var_dump(isset($x-o-zz));
var_dump(isset($x-o-text));
var_dump(isset($x-o-xx));
?
--EXPECTF--
bool(true)
bool(false)
bool(true)
bool(false)
bool(false)
bool(true)


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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/simplexml simplexml.c /ext/simplexml/tests bug46003.phpt

2008-09-10 Thread Rob Richards 
rrichards   Wed Sep 10 16:28:53 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/simplexml/testsbug46003.phpt 

  Modified files:  
/php-src/ext/simplexml  simplexml.c 
  Log:
  MFH: fix bug #46003 (isset on nonexisting node return unexpected results)
  add test
  
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.35.2.18r2=1.151.2.22.2.35.2.19diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.18 
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.19
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.18  Wed Sep 10 
11:21:12 2008
+++ php-src/ext/simplexml/simplexml.c   Wed Sep 10 16:28:53 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: simplexml.c,v 1.151.2.22.2.35.2.18 2008/09/10 11:21:12 rrichards Exp $ 
*/
+/* $Id: simplexml.c,v 1.151.2.22.2.35.2.19 2008/09/10 16:28:53 rrichards Exp $ 
*/
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -821,7 +821,7 @@
while (node) {
xmlNodePtr nnext;
nnext = node-next;
-   if (!xmlStrcmp(node-name, (xmlChar 
*)Z_STRVAL_P(member))) {
+   if ((node-type == XML_ELEMENT_NODE)  
!xmlStrcmp(node-name, (xmlChar *)Z_STRVAL_P(member))) {
break;
}
node = nnext;
@@ -2558,7 +2558,7 @@
 {
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
-   php_info_print_table_row(2, Revision, $Revision: 
1.151.2.22.2.35.2.18 $);
+   php_info_print_table_row(2, Revision, $Revision: 
1.151.2.22.2.35.2.19 $);
php_info_print_table_row(2, Schema support,
 #ifdef LIBXML_SCHEMAS_ENABLED
enabled);

http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug46003.phpt?view=markuprev=1.1
Index: php-src/ext/simplexml/tests/bug46003.phpt
+++ php-src/ext/simplexml/tests/bug46003.phpt
--TEST--
Bug #46003 (isset on nonexisting nodes return unexpected results)
--FILE--
?php
$xml =XML
r
  pTest/p
  o d='h'
xx rr='info' /
yy rr='data' /
  /o
/r
XML;

$x = simplexml_load_string($xml);

var_dump(isset($x-p));
var_dump(isset($x-p-o));
var_dump(isset($x-o-yy));
var_dump(isset($x-o-zz));
var_dump(isset($x-o-text));
var_dump(isset($x-o-xx));
?
--EXPECTF--
bool(true)
bool(false)
bool(true)
bool(false)
bool(false)
bool(true)


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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/simplexml simplexml.c /ext/simplexml/tests bug46003.phpt

2008-09-10 Thread Rob Richards 
rrichards   Wed Sep 10 16:29:18 2008 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/simplexml/testsbug46003.phpt 

  Modified files:  
/php-src/ext/simplexml  simplexml.c 
  Log:
  MFH: fix bug #46003 (isset on nonexisting node return unexpected results)
  add test
  
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.42r2=1.151.2.22.2.43diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.42 
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.43
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.42   Wed Sep 10 11:21:48 2008
+++ php-src/ext/simplexml/simplexml.c   Wed Sep 10 16:29:17 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: simplexml.c,v 1.151.2.22.2.42 2008/09/10 11:21:48 rrichards Exp $ */
+/* $Id: simplexml.c,v 1.151.2.22.2.43 2008/09/10 16:29:17 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -800,7 +800,7 @@
while (node) {
xmlNodePtr nnext;
nnext = node-next;
-   if (!xmlStrcmp(node-name, (xmlChar 
*)Z_STRVAL_P(member))) {
+   if ((node-type == XML_ELEMENT_NODE)  
!xmlStrcmp(node-name, (xmlChar *)Z_STRVAL_P(member))) {
break;
}
node = nnext;
@@ -2446,7 +2446,7 @@
 {
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
-   php_info_print_table_row(2, Revision, $Revision: 1.151.2.22.2.42 $);
+   php_info_print_table_row(2, Revision, $Revision: 1.151.2.22.2.43 $);
php_info_print_table_row(2, Schema support,
 #ifdef LIBXML_SCHEMAS_ENABLED
enabled);

http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug46003.phpt?view=markuprev=1.1
Index: php-src/ext/simplexml/tests/bug46003.phpt
+++ php-src/ext/simplexml/tests/bug46003.phpt
--TEST--
Bug #46003 (isset on nonexisting nodes return unexpected results)
--FILE--
?php
$xml =XML
r
  pTest/p
  o d='h'
xx rr='info' /
yy rr='data' /
  /o
/r
XML;

$x = simplexml_load_string($xml);

var_dump(isset($x-p));
var_dump(isset($x-p-o));
var_dump(isset($x-o-yy));
var_dump(isset($x-o-zz));
var_dump(isset($x-o-text));
var_dump(isset($x-o-xx));
?
--EXPECTF--
bool(true)
bool(false)
bool(true)
bool(false)
bool(false)
bool(true)


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

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS

2008-09-10 Thread Rob Richards 
rrichards   Wed Sep 10 16:29:42 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  BFN
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1221r2=1.2027.2.547.2.1222diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1221 php-src/NEWS:1.2027.2.547.2.1222
--- php-src/NEWS:1.2027.2.547.2.1221Wed Sep 10 15:41:04 2008
+++ php-src/NEWSWed Sep 10 16:29:42 2008
@@ -22,6 +22,7 @@
 - Fixed bug #46029 (Segfault in DOMText when using with Reflection). (Rob)
 - Fixed bug #46010 (warnings incorrectly generated for iv in ecb mode). 
   (Felipe)
+- Fixed bug #46003 (isset on nonexisting node return unexpected results). (Rob)
 - Fixed bug #45956 (parse_ini_file() does not return false with syntax errors
   in parsed file). (Jani)
 - Fixed bug #45862 (get_class_vars is inconsistent with 'protected' and 



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

[PHP-CVS] cvs: win-installer / ExtensionsFeatures53.wxs

2008-09-10 Thread John Mertic 
jmertic Wed Sep 10 20:32:40 2008 UTC

  Modified files:  
/win-installer  ExtensionsFeatures53.wxs 
  Log:
  Enable php_oci8 extension, since it's still being built.
  
http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsFeatures53.wxs?r1=1.7r2=1.8diff_format=u
Index: win-installer/ExtensionsFeatures53.wxs
diff -u win-installer/ExtensionsFeatures53.wxs:1.7 
win-installer/ExtensionsFeatures53.wxs:1.8
--- win-installer/ExtensionsFeatures53.wxs:1.7  Fri Aug 22 18:50:01 2008
+++ win-installer/ExtensionsFeatures53.wxs  Wed Sep 10 20:32:40 2008
@@ -255,6 +255,9 @@
Feature AllowAdvertise=no Id=ext_php_oci 
Title=$(loc.Featureext_php_ociTitle) 
Description=$(loc.Featureext_php_ociDescription) Level=10
ComponentRef Id=php_oci/
/Feature
+   Feature AllowAdvertise=no Id=ext_php_oci8 
Title=$(loc.Featureext_php_oci8Title) 
Description=$(loc.Featureext_php_oci8Description) Level=10
+   ComponentRef Id=php_oci8/
+   /Feature
Feature AllowAdvertise=no Id=ext_php_oci8_11g 
Title=$(loc.Featureext_php_oci8_11gTitle) 
Description=$(loc.Featureext_php_oci8_11gDescription) Level=10
ComponentRef Id=php_oci8_11g/
/Feature



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

[PHP-CVS] cvs: win-installer / ExtensionsFeatures60.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs

2008-09-10 Thread John Mertic 
jmertic Wed Sep 10 20:33:14 2008 UTC

  Modified files:  
/win-installer  ExtensionsFeatures60.wxs PHPInstallerBase60.wxs 
PHPInstallerBase60NTS.wxs 
  Log:
  Sync build changes in 5.3 to 6.0
  http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsFeatures60.wxs?r1=1.1r2=1.2diff_format=u
Index: win-installer/ExtensionsFeatures60.wxs
diff -u win-installer/ExtensionsFeatures60.wxs:1.1 
win-installer/ExtensionsFeatures60.wxs:1.2
--- win-installer/ExtensionsFeatures60.wxs:1.1  Mon Aug  4 15:01:41 2008
+++ win-installer/ExtensionsFeatures60.wxs  Wed Sep 10 20:33:14 2008
@@ -1,7 +1,7 @@
 ?xml version=1.0 encoding=windows-1252?
 Wix xmlns=http://schemas.microsoft.com/wix/2003/01/wi;
Fragment Id=FragmentExtensionsFeatures
-   Feature AllowAdvertise=no Id=Extensions 
Title=$(loc.FeatureExtensionsTitle) 
Description=$(loc.FeatureExtensionsDescription) Level=10
+   Feature AllowAdvertise=no Id=Extensions 
Title=$(loc.FeatureExtensionsTitle) 
Description=$(loc.FeatureExtensionsDescription) TypicalDefault=install 
Level=1
ComponentRef Id=extdir/
Feature AllowAdvertise=no Id=pecl_php5activescript 
Title=$(loc.Featurepecl_phpactivescriptTitle) 
Description=$(loc.Featurepecl_phpactivescriptDescription) Level=10
ComponentRef Id=php5activescript/
@@ -30,7 +30,7 @@
Feature AllowAdvertise=no Id=ext_php_blenc 
Title=$(loc.Featureext_php_blencTitle) 
Description=$(loc.Featureext_php_blencDescription) Level=10
ComponentRef Id=php_blenc/
/Feature
-   Feature AllowAdvertise=no Id=ext_php_bz2 
Title=$(loc.Featureext_php_bz2Title) 
Description=$(loc.Featureext_php_bz2Description) Level=10
+   Feature AllowAdvertise=no Id=ext_php_bz2 
Title=$(loc.Featureext_php_bz2Title) 
Description=$(loc.Featureext_php_bz2Description) TypicalDefault=install 
Level=1
ComponentRef Id=php_bz2/
/Feature
Feature AllowAdvertise=no Id=ext_php_bz2_filter 
Title=$(loc.Featureext_php_bz2_filterTitle) 
Description=$(loc.Featureext_php_bz2_filterDescription) Level=10
@@ -48,7 +48,7 @@
Feature AllowAdvertise=no Id=ext_php_cvsclient 
Title=$(loc.Featureext_php_cvsclientTitle) 
Description=$(loc.Featureext_php_cvsclientDescription) Level=10
ComponentRef Id=php_cvsclient/
/Feature
-   Feature AllowAdvertise=no Id=ext_php_curl 
Title=$(loc.Featureext_php_curlTitle) 
Description=$(loc.Featureext_php_curlDescription) Level=10
+   Feature AllowAdvertise=no Id=ext_php_curl 
Title=$(loc.Featureext_php_curlTitle) 
Description=$(loc.Featureext_php_curlDescription) TypicalDefault=install 
Level=1
ComponentRef Id=php_curl/
ComponentRef Id=libeay32DLL/
ComponentRef Id=ssleay32DLL/
@@ -80,7 +80,7 @@
Feature AllowAdvertise=no Id=ext_php_event 
Title=$(loc.Featureext_php_eventTitle) 
Description=$(loc.Featureext_php_eventDescription) Level=10
ComponentRef Id=php_event/
/Feature
-   Feature AllowAdvertise=no Id=ext_php_exif 
Title=$(loc.Featureext_php_exifTitle) 
Description=$(loc.Featureext_php_exifDescription) Level=10
+   Feature AllowAdvertise=no Id=ext_php_exif 
Title=$(loc.Featureext_php_exifTitle) 
Description=$(loc.Featureext_php_exifDescription) TypicalDefault=install 
Level=1
ComponentRef Id=php_mbstring/
ComponentRef Id=php_exif/
/Feature
@@ -89,6 +89,9 @@
ComponentRef Id=fdftkDLL/
ComponentRef Id=PDFSupport/
/Feature
+   Feature AllowAdvertise=no Id=ext_php_ffi 
Title=$(loc.Featureext_php_ffiTitle) 
Description=$(loc.Featureext_php_ffiDescription) Level=10
+   ComponentRef Id=php_ffi/
+   /Feature
Feature AllowAdvertise=no Id=ext_php_fileinfo 
Title=$(loc.Featureext_php_fileinfoTitle) 
Description=$(loc.Featureext_php_fileinfoDescription) Level=10
ComponentRef Id=php_fileinfo/
/Feature
@@ -99,13 +102,13 @@
ComponentRef Id=php_fribidi/
ComponentRef Id=fribidiDLL/
/Feature
-   Feature AllowAdvertise=no Id=ext_php_gd2 
Title=$(loc.Featureext_php_gd2Title) 
Description=$(loc.Featureext_php_gd2Description) Level=10
+   Feature

[PHP-CVS] cvs: win-installer / ExtensionsFragment60.wxs WebServerConfig60.wxs

2008-09-10 Thread John Mertic 
jmertic Wed Sep 10 20:37:27 2008 UTC

  Modified files:  
/win-installer  ExtensionsFragment60.wxs WebServerConfig60.wxs 
  Log:
  Sync build changes in 5.3 to 6.0
  http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsFragment60.wxs?r1=1.1r2=1.2diff_format=u
Index: win-installer/ExtensionsFragment60.wxs
diff -u win-installer/ExtensionsFragment60.wxs:1.1 
win-installer/ExtensionsFragment60.wxs:1.2
--- win-installer/ExtensionsFragment60.wxs:1.1  Fri Aug 22 18:51:40 2008
+++ win-installer/ExtensionsFragment60.wxs  Wed Sep 10 20:37:27 2008
@@ -14,9 +14,6 @@
Component Id=libmcryptDLL DiskId=1 
Guid=34402BFF-5D45-4A07-89EF-C71F4DF3D9BF
File Id=filelibmcryptDLL Name=LIBMCR_1.DLL 
LongName=libmcrypt.dll Source=Files\libmcrypt.dll /
/Component
-   Component Id=libmhashDLL DiskId=1 
Guid=D19BD1F8-8041-4D0A-809C-57BB69619683
-   File Id=filelibmhashDLL Name=libmhash.dll 
Source=Files\libmhash.dll /
-   /Component
Component Id=libmysqlDLL DiskId=1 
Guid=4726DE50-BC55-46AC-9622-DEA04AE46E46
File Id=filelibmysqlDLL Name=libmysql.dll 
Source=Files\libmysql.dll /
/Component
@@ -41,6 +38,27 @@
Component Id=fribidiDLL DiskId=1 
Guid=D08A7C40-924B-45B2-8053-C6A5117846B2
File Id=filefribidiDLL Name=fribidi.dll 
Source=Files\fribidi.dll /
/Component
+   Component Id=icudt36DLL DiskId=1 
Guid=6370818E-7072-11DD-A88E-285D55D89593
+   File Id=fileicudt36DLL Name=icudt36.dll 
Source=Files\icudt36.dll /
+   /Component
+   Component Id=icuin36DLL DiskId=1 
Guid=6A57F7AC-7072-11DD-86B2-645D55D89593
+   File Id=fileicuin36DLL Name=icuin36.dll 
Source=Files\icuin36.dll /
+   /Component
+   Component Id=icuio36DLL DiskId=1 
Guid=705AA974-7072-11DD-AC26-CE5D55D89593
+   File Id=fileicuio36DLL Name=icuio36.dll 
Source=Files\icuio36.dll /
+   /Component
+   Component Id=icule36DLL DiskId=1 
Guid=7729BDA8-7072-11DD-ADF2-165E55D89593
+   File Id=fileicule36DLL Name=icule36.dll 
Source=Files\icule36.dll /
+   /Component
+   Component Id=iculx36DLL DiskId=1 
Guid=7E7C2D16-7072-11DD-B66F-5F5E55D89593
+   File Id=fileiculx36DLL Name=iculx36.dll 
Source=Files\iculx36.dll /
+   /Component
+   Component Id=icutu36DLL DiskId=1 
Guid=83707DAE-7072-11DD-8A63-B75E55D89593
+   File Id=fileicutu36DLL Name=icutu36.dll 
Source=Files\icutu36.dll /
+   /Component
+   Component Id=icuuc36DLL DiskId=1 
Guid=93D0C0BE-7072-11DD-B624-6F5F55D89593
+   File Id=fileicuuc36DLL Name=icuuc36.dll 
Source=Files\icuuc36.dll /
+   /Component
Directory Id=extdirectory Name=ext
Component Id=extdir DiskId=1 
Guid=3AB11270-4135-4C8C-9578-B034CEF2659F
IniFile Id=extdirINI 
Action=addLine 
@@ -49,127 +67,7 @@
/Component
/Directory
 Directory Id=extrasdirectory Name=extras
-   Component Id=magicMIME DiskId=1 
Guid=C29559A6-DE77-4951-A8F8-6266B790DE20
-   File Id=filemagicMIME 
Name=MAGIC_1.MIM LongName=magic.mime Source=Files\extras\magic.mime /
-   /Component
-   Directory Id=openssldirectory Name=openssl
-   Component Id=opensslCNF DiskId=1 
Guid=0460291A-A0BA-4662-946E-3832BAB70881
-   File Id=fileopensslCNF 
Name=openssl.cnf Source=Files\extras\openssl\openssl.cnf /
-   /Component
-   Component Id=READMESSLTXT DiskId=1 
Guid=2E97C140-AFDA-4235-BF37-5F9FD6C52F57
-   File Id=fileREADMESSLTXT 
Name=README_1.TXT LongName=README-SSL.txt 
Source=Files\extras\openssl\README-SSL.txt /
-   /Component
-   /Directory
-   Directory Id=pdfrelateddirectory 
Name=PDF-RE_1 LongName=pdf-related
-   Component Id=PDFSupport DiskId=1 
Guid=47C794BB-250C-4235-89A8-B192C994B98B
-   File Id=filePDFSupport1 
Name=COPYRI_1.TXT LongName=copyright.txt

[PHP-CVS] cvs: win-installer / PHPInstallerCommon.wxs

2008-09-10 Thread John Mertic 
jmertic Wed Sep 10 20:49:17 2008 UTC

  Modified files:  
/win-installer  PHPInstallerCommon.wxs 
  Log:
  Fix Typo
  
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerCommon.wxs?r1=1.10r2=1.11diff_format=u
Index: win-installer/PHPInstallerCommon.wxs
diff -u win-installer/PHPInstallerCommon.wxs:1.10 
win-installer/PHPInstallerCommon.wxs:1.11
--- win-installer/PHPInstallerCommon.wxs:1.10   Wed Sep 10 20:32:05 2008
+++ win-installer/PHPInstallerCommon.wxsWed Sep 10 20:49:17 2008
@@ -605,7 +605,7 @@
 Control Id=Buttons Type=RadioButtonGroup
 X=20 Y=50 Width=330 Height=180 Property=WEBSERVERPICKER 
/
 Control Id=Next Type=PushButton X=236 Y=243 Width=56 
Height=17 Default=yes Text=$(loc.WixUINext)
-  Publish Evenst=AddLocal Value=apache13![CDATA[WEBSERVERPICKER 
= apache13]]/Publish
+  Publish Event=AddLocal Value=apache13![CDATA[WEBSERVERPICKER 
= apache13]]/Publish
   Publish Event=AddLocal Value=apache20![CDATA[WEBSERVERPICKER 
= apache20]]/Publish
   Publish Event=AddLocal Value=apache22![CDATA[WEBSERVERPICKER 
= apache22]]/Publish
   Publish Event=AddLocal Value=apacheCGI![CDATA[WEBSERVERPICKER 
= apacheCGI]]/Publish



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mbstring mbstring.c

2008-09-10 Thread Ilia Alshanetsky 
iliaa   Wed Sep 10 23:19:38 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mbstring   mbstring.c 
  Log:
  Fixed bug #46042 (memory leaks with reflection of mb_convert_encoding())
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.25.2.31r2=1.224.2.22.2.25.2.32diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.31 
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.32
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.31Mon Aug 18 
00:37:16 2008
+++ php-src/ext/mbstring/mbstring.c Wed Sep 10 23:19:38 2008
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: mbstring.c,v 1.224.2.22.2.25.2.31 2008/08/18 00:37:16 felipe Exp $ */
+/* $Id: mbstring.c,v 1.224.2.22.2.25.2.32 2008/09/10 23:19:38 iliaa Exp $ */
 
 /*
  * PHP 4 Multibyte String module mbstring
@@ -3117,7 +3117,7 @@
s_free = _from_encodings;
break;
default:
-   convert_to_string_ex(arg_old);
+   convert_to_string(arg_old);
_from_encodings = Z_STRVAL_P(arg_old);
break;
}
@@ -3238,7 +3238,7 @@
}
break;
default:
-   convert_to_string_ex(encoding_list);
+   convert_to_string(encoding_list);
if 
(!php_mb_parse_encoding_list(Z_STRVAL_P(encoding_list), 
Z_STRLEN_P(encoding_list), list, size, 0 TSRMLS_CC)) {
if (list) {
efree(list);



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

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

2008-09-10 Thread Ilia Alshanetsky 
iliaa   Wed Sep 10 23:19:50 2008 UTC

  Modified files:  
/php-src/ext/mbstring   mbstring.c 
  Log:
  
  MFB: Fixed bug #46042 (memory leaks with reflection of
  mb_convert_encoding())
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.297r2=1.298diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.297 
php-src/ext/mbstring/mbstring.c:1.298
--- php-src/ext/mbstring/mbstring.c:1.297   Mon Aug 18 00:36:03 2008
+++ php-src/ext/mbstring/mbstring.c Wed Sep 10 23:19:50 2008
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: mbstring.c,v 1.297 2008/08/18 00:36:03 felipe Exp $ */
+/* $Id: mbstring.c,v 1.298 2008/09/10 23:19:50 iliaa Exp $ */
 
 /*
  * PHP 4 Multibyte String module mbstring
@@ -2961,7 +2961,7 @@
s_free = _from_encodings;
break;
default:
-   convert_to_string_ex(arg_old);
+   convert_to_string(arg_old);
_from_encodings = Z_STRVAL_P(arg_old);
break;
}
@@ -3082,7 +3082,7 @@
}
break;
default:
-   convert_to_string_ex(encoding_list);
+   convert_to_string(encoding_list);
if 
(!php_mb_parse_encoding_list(Z_STRVAL_P(encoding_list), 
Z_STRLEN_P(encoding_list), list, size, 0 TSRMLS_CC)) {
if (list) {
efree(list);



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/general_functions parse_ini_basic.data parse_ini_basic.phpt

2008-09-10 Thread Stanislav Malyshev 
stasThu Sep 11 00:34:48 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard/tests/general_functions   parse_ini_basic.data 
parse_ini_basic.phpt 
  Log:
  add some windows-style INI entries to tests
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/parse_ini_basic.data?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/standard/tests/general_functions/parse_ini_basic.data
diff -u 
php-src/ext/standard/tests/general_functions/parse_ini_basic.data:1.1.2.3 
php-src/ext/standard/tests/general_functions/parse_ini_basic.data:1.1.2.4
--- php-src/ext/standard/tests/general_functions/parse_ini_basic.data:1.1.2.3   
Mon Feb  4 20:45:20 2008
+++ php-src/ext/standard/tests/general_functions/parse_ini_basic.data   Thu Sep 
11 00:34:48 2008
@@ -1,129 +1,132 @@
-[basic]
-basicval = bar
-longval  = 12345
-with.dot = fooobar
-boolon = on
-booltrue = true
-boolyes = yes
-booloff = off
-boolfalse = false
-boolnone = none
-boolno = no
-string = asdadfsdjkslkj [EMAIL PROTECTED] { }[ ]/%#¤
-sqstring = 'adsasdadasdasd'
-dqstring = asdadfsdjkslkj [EMAIL PROTECTED] { } !^~|¥¥{[()/)/% ¤ # #
-php_constant = E_ALL
-user_constant = TEST_CONSTANT
-
-[basic with whitespace]
-basicval =  bar
-longval  = 12345   
-with.dot = fooobar 
-boolon =   on   
-booltrue =  true
-boolyes =yes
-booloff =off
-boolfalse = false   
-boolnone =  none
-boolno = no 
-sqstring =  'adsasdadasdasd'
-dqstring =  asdadfsdjkslkj [EMAIL 
PROTECTED]()/)/%#¤   
-php_constant =  E_ALL   
-
-[comments]
-; some comment
-   ; some comment with whitespace   
-somecomment = comment follows;[EMAIL PROTECTED] ; comment here
-;
-
-[variables]
-var1 = ${basicval}
-var2 = ${basicval}/foo
-var3 = foo/${basicval}
-var4 = foo/${basicval}/foo
-quoted_var1 = ${basicqval}
-quoted_var2 = ${basicqval}/foo
-quoted_var3 = foo/${basicqval}
-quoted_var4 = foo/${basicqval}/foo
-
-[offset values]
-foo1[] = basic offset 1
-foo1[  ] = basic offset 2
-foo2[123] = long offset
-foo3[abc] = string offset
-foo4[] = quoted offset 1
-foo4[ ] = quoted offset 2
-foo4[sqfoobar] = quoted string offset
-foo4['dqfoobar'] = single quoted offset
-foo6[${basicval}] = variable
-foo6[${basicval}/foo] = variable with string 1
-foo6[foo/${basicval}] = variable with string 2
-foo6[foo/${basicval}/foo] = variable with string 3
-foo7[${basicqval}] = quoted variable 1
-foo7[${basicqval}/foo] = quoted variable 2
-foo7[foo/${basicqval}] = quoted variable 3
-foo7[ foo/${basicqval}/foo ] = quoted variable 4
-
-[non value]
-novalue_option1  = 
-novalue_option2=   
-novalue_option3  =
-novalue_option4=
-novalue_option4[]   =
-novalue_option4[]=  
-novalue_option4[]=
-
-[Quoted strings and variables in sections]
-
-[${basicval}]
-[${basicval}/foo]
-[foo/${basicval}]
-[foo/${basicval}/foo]
-
-[${basicqval}]
-[${basicqval}/foo]
-[foo/${basicqval}]
-[foo/${basicqval}/foo]
-
-[PATH=${basicval}/no/quotes]
-; Invalid!
-;[PATH=${basicval}/path/quoted]
-[PATH=${basicval}/all/quoted]
-
-; This is test for bug #29306
-[01]
-e=e
-f=f
-[02]
-g=g
-h=h
-[1]
-a=a
-b=b
-[2]
-c=c
-d=d
-[0815]
-bla=bla
-
-;Test for bug #43923
-[bug #43923]
-curly1 = {
-curly2 = {
-curly3 = '{'
-
-;Test for bug #44019
-[bug #44019]
-concatenation_before = TEST_CONSTANT +some_text_after
-concatenation_middle = some_text_before+ TEST_CONSTANT +some_text_after
-concatenation_after = some_text_before+ TEST_CONSTANT
-concatenation_nows_before = TEST_CONSTANT+some_text_after
-concatenation_nows_middle = some_text_before+TEST_CONSTANT+some_text_after
-concatenation_nows_after = some_text_before+TEST_CONSTANT
-
-;Test for bug #43915
-[bug #43915]
-ini_with-hyphen = with hyphen and underscore
-ini.with-hyphen = dot and hyphen
-ini-with.hyphen = hyphen and dot
-
+[basic]
+basicval = bar
+longval  = 12345
+with.dot = fooobar
+boolon = on
+booltrue = true
+boolyes = yes
+booloff = off
+boolfalse = false
+boolnone = none
+boolno = no
+string = asdadfsdjkslkj [EMAIL PROTECTED] { }[ ]/%#¤
+sqstring = 'adsasdadasdasd'
+dqstring = asdadfsdjkslkj [EMAIL PROTECTED] { } !^~|¥¥{[()/)/% ¤ # #
+php_constant = E_ALL
+user_constant = TEST_CONSTANT
+
+[basic with whitespace]
+basicval =  bar
+longval  = 12345   
+with.dot = fooobar 
+boolon =

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/general_functions parse_ini_basic.data

2008-09-10 Thread Stanislav Malyshev 
stasThu Sep 11 00:41:29 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard/tests/general_functions   parse_ini_basic.data 
  Log:
  fix file format
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/parse_ini_basic.data?r1=1.1.2.4r2=1.1.2.5diff_format=u
Index: php-src/ext/standard/tests/general_functions/parse_ini_basic.data
diff -u 
php-src/ext/standard/tests/general_functions/parse_ini_basic.data:1.1.2.4 
php-src/ext/standard/tests/general_functions/parse_ini_basic.data:1.1.2.5
--- php-src/ext/standard/tests/general_functions/parse_ini_basic.data:1.1.2.4   
Thu Sep 11 00:34:48 2008
+++ php-src/ext/standard/tests/general_functions/parse_ini_basic.data   Thu Sep 
11 00:41:29 2008
@@ -1,132 +1,132 @@
-[basic]
-basicval = bar
-longval  = 12345
-with.dot = fooobar
-boolon = on
-booltrue = true
-boolyes = yes
-booloff = off
-boolfalse = false
-boolnone = none
-boolno = no
-string = asdadfsdjkslkj [EMAIL PROTECTED] { }[ ]/%#¤
-sqstring = 'adsasdadasdasd'
-dqstring = asdadfsdjkslkj [EMAIL PROTECTED] { } !^~|¥¥{[()/)/% ¤ # #
-php_constant = E_ALL
-user_constant = TEST_CONSTANT
-
-[basic with whitespace]
-basicval =  bar
-longval  = 12345   
-with.dot = fooobar 
-boolon =   on   
-booltrue =  true
-boolyes =yes
-booloff =off
-boolfalse = false   
-boolnone =  none
-boolno = no 
-sqstring =  'adsasdadasdasd'
-dqstring =  asdadfsdjkslkj [EMAIL 
PROTECTED]()/)/%#¤   
-php_constant =  E_ALL   
-
-[comments]
-; some comment
-   ; some comment with whitespace   
-somecomment = comment follows;[EMAIL PROTECTED] ; comment here
-;
-
-[variables]
-var1 = ${basicval}
-var2 = ${basicval}/foo
-var3 = foo/${basicval}
-var4 = foo/${basicval}/foo
-quoted_var1 = ${basicqval}
-quoted_var2 = ${basicqval}/foo
-quoted_var3 = foo/${basicqval}
-quoted_var4 = foo/${basicqval}/foo
-
-[offset values]
-foo1[] = basic offset 1
-foo1[  ] = basic offset 2
-foo2[123] = long offset
-foo3[abc] = string offset
-foo4[] = quoted offset 1
-foo4[ ] = quoted offset 2
-foo4[sqfoobar] = quoted string offset
-foo4['dqfoobar'] = single quoted offset
-foo6[${basicval}] = variable
-foo6[${basicval}/foo] = variable with string 1
-foo6[foo/${basicval}] = variable with string 2
-foo6[foo/${basicval}/foo] = variable with string 3
-foo7[${basicqval}] = quoted variable 1
-foo7[${basicqval}/foo] = quoted variable 2
-foo7[foo/${basicqval}] = quoted variable 3
-foo7[ foo/${basicqval}/foo ] = quoted variable 4
-
-[non value]
-novalue_option1  = 
-novalue_option2=   
-novalue_option3  =
-novalue_option4=
-novalue_option4[]   =
-novalue_option4[]=  
-novalue_option4[]=
-
-[Quoted strings and variables in sections]
-
-[${basicval}]
-[${basicval}/foo]
-[foo/${basicval}]
-[foo/${basicval}/foo]
-
-[${basicqval}]
-[${basicqval}/foo]
-[foo/${basicqval}]
-[foo/${basicqval}/foo]
-
-[PATH=${basicval}/no/quotes]
-; Invalid!
-;[PATH=${basicval}/path/quoted]
-[PATH=${basicval}/all/quoted]
-
-; This is test for bug #29306
-[01]
-e=e
-f=f
-[02]
-g=g
-h=h
-[1]
-a=a
-b=b
-[2]
-c=c
-d=d
-[0815]
-bla=bla
-
-;Test for bug #43923
-[bug #43923]
-curly1 = {
-curly2 = {
-curly3 = '{'
-
-;Test for bug #44019
-[bug #44019]
-concatenation_before = TEST_CONSTANT +some_text_after
-concatenation_middle = some_text_before+ TEST_CONSTANT +some_text_after
-concatenation_after = some_text_before+ TEST_CONSTANT
-concatenation_nows_before = TEST_CONSTANT+some_text_after
-concatenation_nows_middle = some_text_before+TEST_CONSTANT+some_text_after
-concatenation_nows_after = some_text_before+TEST_CONSTANT
-
-;Test for bug #43915
-[bug #43915]
-ini_with-hyphen = with hyphen and underscore
-ini.with-hyphen = dot and hyphen
-ini-with.hyphen = hyphen and dot
-
-[windows paths]
-winpath1=c:\some windows\path\test\new\r\quote \ here\single ' quote\some 
more
-winpath2=special case\
+[basic]
+basicval = bar
+longval  = 12345
+with.dot = fooobar
+boolon = on
+booltrue = true
+boolyes = yes
+booloff = off
+boolfalse = false
+boolnone = none
+boolno = no
+string = asdadfsdjkslkj [EMAIL PROTECTED] { }[ ]/%#¤
+sqstring = 'adsasdadasdasd'
+dqstring = asdadfsdjkslkj [EMAIL PROTECTED] { } !^~|¥¥{[()/)/% ¤ # #
+php_constant = E_ALL
+user_constant = TEST_CONSTANT
+
+[basic with whitespace]
+basicval =  bar
+longval  = 12345   
+with.dot = fooobar

[PHP-CVS] cvs: php-src /ext/standard/tests/general_functions parse_ini_basic.data parse_ini_basic.phpt

2008-09-10 Thread Stanislav Malyshev 
stasThu Sep 11 00:50:08 2008 UTC

  Modified files:  
/php-src/ext/standard/tests/general_functions   parse_ini_basic.data 
parse_ini_basic.phpt 
  Log:
  add some windows-style INI entries to tests
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/parse_ini_basic.data?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/standard/tests/general_functions/parse_ini_basic.data
diff -u php-src/ext/standard/tests/general_functions/parse_ini_basic.data:1.2 
php-src/ext/standard/tests/general_functions/parse_ini_basic.data:1.3
--- php-src/ext/standard/tests/general_functions/parse_ini_basic.data:1.2   
Mon Feb  4 20:45:16 2008
+++ php-src/ext/standard/tests/general_functions/parse_ini_basic.data   Thu Sep 
11 00:50:08 2008
@@ -127,3 +127,6 @@
 ini.with-hyphen = dot and hyphen
 ini-with.hyphen = hyphen and dot
 
+[windows paths]
+winpath1=c:\some windows\path\test\new\r\quote \ here\single ' quote\some 
more
+winpath2=special case\
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/parse_ini_basic.phpt?r1=1.6r2=1.7diff_format=u
Index: php-src/ext/standard/tests/general_functions/parse_ini_basic.phpt
diff -u php-src/ext/standard/tests/general_functions/parse_ini_basic.phpt:1.6 
php-src/ext/standard/tests/general_functions/parse_ini_basic.phpt:1.7
--- php-src/ext/standard/tests/general_functions/parse_ini_basic.phpt:1.6   
Sun Aug 31 00:19:21 2008
+++ php-src/ext/standard/tests/general_functions/parse_ini_basic.phpt   Thu Sep 
11 00:50:08 2008
@@ -15,7 +15,7 @@
 echo Done.\n;
 ?
 --EXPECT--
-array(25) {
+array(26) {
   [ubasic]=
   array(15) {
 [ubasicval]=
@@ -272,5 +272,12 @@
 [uini-with.hyphen]=
 unicode(14) hyphen and dot
   }
+  [uwindows paths]=
+  array(2) {
+[uwinpath1]=
+unicode(69) c:\some windows\path\test\new\r\quote  here\single ' 
quote\some more
+[uwinpath2]=
+unicode(13) special case\
+  }
 }
 Done.



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar_object.c /ext/phar/tests bug46032.phpt

2008-09-10 Thread Greg Beaver 
cellog  Thu Sep 11 03:29:15 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/phar/tests bug46032.phpt 

  Modified files:  
/php-src/ext/phar   phar_object.c 
  Log:
  fix Bug #46032: PharData::__construct wrong memory read
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.266.2.46r2=1.266.2.47diff_format=u
Index: php-src/ext/phar/phar_object.c
diff -u php-src/ext/phar/phar_object.c:1.266.2.46 
php-src/ext/phar/phar_object.c:1.266.2.47
--- php-src/ext/phar/phar_object.c:1.266.2.46   Sun Aug 31 21:02:55 2008
+++ php-src/ext/phar/phar_object.c  Thu Sep 11 03:29:14 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: phar_object.c,v 1.266.2.46 2008/08/31 21:02:55 sfox Exp $ */
+/* $Id: phar_object.c,v 1.266.2.47 2008/09/11 03:29:14 cellog Exp $ */
 
 #include phar_internal.h
 #include func_interceptors.h
@@ -1165,10 +1165,10 @@
return;
}
 
+   save_fname = fname;
if (SUCCESS == phar_split_fname(fname, fname_len, arch, arch_len, 
entry, entry_len, !is_data, 2 TSRMLS_CC)) {
/* use arch (the basename for the archive) for fname instead of 
fname */
/* this allows support for RecursiveDirectoryIterator of 
subdirectories */
-   save_fname = fname;
 #ifdef PHP_WIN32
phar_unixify_path_separators(arch, arch_len);
 #endif
@@ -1178,7 +1178,6 @@
} else {
arch = estrndup(fname, fname_len);
arch_len = fname_len;
-   save_fname = fname;
fname = arch;
phar_unixify_path_separators(arch, arch_len);
 #endif
@@ -1186,7 +1185,7 @@
 
if (phar_open_or_create_filename(fname, fname_len, alias, alias_len, 
is_data, REPORT_ERRORS, phar_data, error TSRMLS_CC) == FAILURE) {
 
-   if (fname == arch) {
+   if (fname == arch  fname != save_fname) {
efree(arch);
fname = save_fname;
}

http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/bug46032.phpt?view=markuprev=1.1
Index: php-src/ext/phar/tests/bug46032.phpt
+++ php-src/ext/phar/tests/bug46032.phpt



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

[PHP-CVS] cvs: php-src /ext/phar phar_object.c util.c /ext/phar/tests bug46032.phpt

2008-09-10 Thread Greg Beaver 
cellog  Thu Sep 11 03:29:42 2008 UTC

  Modified files:  
/php-src/ext/phar   phar_object.c util.c 
/php-src/ext/phar/tests bug46032.phpt 
  Log:
  MFPHP5: fix Bug #46032: PharData::__construct wrong memory read
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.282r2=1.283diff_format=u
Index: php-src/ext/phar/phar_object.c
diff -u php-src/ext/phar/phar_object.c:1.282 
php-src/ext/phar/phar_object.c:1.283
--- php-src/ext/phar/phar_object.c:1.282Sun Aug 31 20:54:27 2008
+++ php-src/ext/phar/phar_object.c  Thu Sep 11 03:29:42 2008
@@ -17,7 +17,7 @@
   +--+
 */
 
-/* $Id: phar_object.c,v 1.282 2008/08/31 20:54:27 sfox Exp $ */
+/* $Id: phar_object.c,v 1.283 2008/09/11 03:29:42 cellog Exp $ */
 
 #include phar_internal.h
 #include func_interceptors.h
@@ -1165,10 +1165,10 @@
return;
}
 
+   save_fname = fname;
if (SUCCESS == phar_split_fname(fname, fname_len, arch, arch_len, 
entry, entry_len, !is_data, 2 TSRMLS_CC)) {
/* use arch (the basename for the archive) for fname instead of 
fname */
/* this allows support for RecursiveDirectoryIterator of 
subdirectories */
-   save_fname = fname;
 #ifdef PHP_WIN32
phar_unixify_path_separators(arch, arch_len);
 #endif
@@ -1178,7 +1178,6 @@
} else {
arch = estrndup(fname, fname_len);
arch_len = fname_len;
-   save_fname = fname;
fname = arch;
phar_unixify_path_separators(arch, arch_len);
 #endif
@@ -1186,7 +1185,7 @@
 
if (phar_open_or_create_filename(fname, fname_len, alias, alias_len, 
is_data, REPORT_ERRORS, phar_data, error TSRMLS_CC) == FAILURE) {
 
-   if (fname == arch) {
+   if (fname == arch  fname != save_fname) {
efree(arch);
fname = save_fname;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/util.c?r1=1.61r2=1.62diff_format=u
Index: php-src/ext/phar/util.c
diff -u php-src/ext/phar/util.c:1.61 php-src/ext/phar/util.c:1.62
--- php-src/ext/phar/util.c:1.61Sun Aug 31 20:54:27 2008
+++ php-src/ext/phar/util.c Thu Sep 11 03:29:42 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: util.c,v 1.61 2008/08/31 20:54:27 sfox Exp $ */
+/* $Id: util.c,v 1.62 2008/09/11 03:29:42 cellog Exp $ */
 
 #include phar_internal.h
 
@@ -1186,6 +1186,10 @@
 }
 /* }}} */
 
+static int phar_retrieve_apc(fname, fname_len, archive)
+{
+}
+
 /**
  * Looks up a phar archive in the filename map, connecting it to the alias
  * (if any) or returns null
@@ -1381,11 +1385,18 @@
 
return SUCCESS;
}
+ util.c
+   if (SUCCESS == phar_retrieve_apc(fname, fname_len, archive)) {
+   efree(my_realpath);
+   return SUCCESS;
+   }
+===
 
if (PHAR_G(manifest_cached)  SUCCESS == 
zend_hash_quick_find(cached_phars, fname, fname_len, fhash, (void**)fd_ptr)) {
goto realpath_success;
}
 
+ 1.60
efree(my_realpath);
}
 
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/bug46032.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/phar/tests/bug46032.phpt
diff -u /dev/null php-src/ext/phar/tests/bug46032.phpt:1.2
--- /dev/null   Thu Sep 11 03:29:42 2008
+++ php-src/ext/phar/tests/bug46032.phptThu Sep 11 03:29:42 2008
@@ -0,0 +1,34 @@
+--TEST--
+Phar: bug #46032: PharData::__construct wrong memory read
+--SKIPIF--
+?php if (!extension_loaded(phar)) die(skip); ?
+?php if (getenv('SKIP_SLOW_TESTS')) die('skip'); ?
+--FILE--
+?php
+
+$a = __DIR__ .'/mytest';
+
+try {
+   new phar($a);
+} catch (exception $e) { }
+
+var_dump($a);
+
+try {
+   new phar($a);
+} catch (exception $e) { }
+
+var_dump($a);
+
+new phardata('000');
+?
+===DONE===
+--EXPECTF--
+string(%d) %smytest
+string(%d) %smytest
+
+Fatal error: Uncaught exception 'UnexpectedValueException' with message 
'Cannot create phar '000', file extension (or combination) not 
recognised' in %sbug46032.php:%d
+Stack trace:
+#0 /home/cellog/workspace/php5/ext/phar/tests/bug46032.php(%d): 
PharData-__construct('000...')
+#1 {main}
+  thrown in %sbug46032.php on line %d



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

[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS

2008-09-10 Thread Greg Beaver 
cellog  Thu Sep 11 03:29:55 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
  Log:
  update NEWS to note bug #46032 fix
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.313r2=1.2027.2.547.2.965.2.314diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.313 
php-src/NEWS:1.2027.2.547.2.965.2.314
--- php-src/NEWS:1.2027.2.547.2.965.2.313   Wed Sep 10 10:28:57 2008
+++ php-src/NEWSThu Sep 11 03:29:54 2008
@@ -38,6 +38,7 @@
 - Fixed a bug causing miscalculations with the last weekday of n month
   relative time string. (Derick)
 
+- Fixed bug #46032 (PharData::__construct() wrong memory read). (Greg)
 - Fixed bug #45826 (custom ArrayObject serialization). (Etienne)
 - Fixed bug #45798 (sqlite3 doesn't notice if variable was bound). (Felipe)
 - Fixed bug #45786 (FastCGI process exited unexpectedly). (Dmitry)



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

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

2008-09-10 Thread Greg Beaver 
cellog  Thu Sep 11 03:33:10 2008 UTC

  Modified files:  
/php-src/ext/phar   util.c 
  Log:
  remove weird relic of development past that somehow made it in here on the 
last commit
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/util.c?r1=1.62r2=1.63diff_format=u
Index: php-src/ext/phar/util.c
diff -u php-src/ext/phar/util.c:1.62 php-src/ext/phar/util.c:1.63
--- php-src/ext/phar/util.c:1.62Thu Sep 11 03:29:42 2008
+++ php-src/ext/phar/util.c Thu Sep 11 03:33:10 2008
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: util.c,v 1.62 2008/09/11 03:29:42 cellog Exp $ */
+/* $Id: util.c,v 1.63 2008/09/11 03:33:10 cellog Exp $ */
 
 #include phar_internal.h
 
@@ -1186,10 +1186,6 @@
 }
 /* }}} */
 
-static int phar_retrieve_apc(fname, fname_len, archive)
-{
-}
-
 /**
  * Looks up a phar archive in the filename map, connecting it to the alias
  * (if any) or returns null
@@ -1385,18 +1381,11 @@
 
return SUCCESS;
}
- util.c
-   if (SUCCESS == phar_retrieve_apc(fname, fname_len, archive)) {
-   efree(my_realpath);
-   return SUCCESS;
-   }
-===
 
if (PHAR_G(manifest_cached)  SUCCESS == 
zend_hash_quick_find(cached_phars, fname, fname_len, fhash, (void**)fd_ptr)) {
goto realpath_success;
}
 
- 1.60
efree(my_realpath);
}
 



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