[PHP-CVS-DAILY] cvs: php-src / ChangeLog

2009-03-26 Thread changelog 
changelog   Fri Mar 27 01:32:51 2009 UTC

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3355r2=1.3356diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.3355 php-src/ChangeLog:1.3356
--- php-src/ChangeLog:1.3355Thu Mar 26 01:32:57 2009
+++ php-src/ChangeLog   Fri Mar 27 01:32:50 2009
@@ -1,3 +1,228 @@
+2009-03-26  Felipe Pena  felipe...@gmail.com
+
+* ext/standard/syslog.c:
+  - Removed unused declaration
+
+* ZendEngine2/zend_constants.c
+  ZendEngine2/zend_hash.c
+  ZendEngine2/zend_object_handlers.c
+  ZendEngine2/zend_operators.c
+  ext/date/php_date.c
+  ext/libxml/libxml.c
+  ext/soap/soap.c
+  ext/standard/string.c
+  ext/standard/var_unserializer.c
+  ext/standard/var_unserializer.re:
+  - Removed unused variables
+
+* ZendEngine2/zend.c
+  ZendEngine2/zend.h
+  ZendEngine2/zend_API.c
+  ZendEngine2/zend_API.h
+  ZendEngine2/zend_builtin_functions.c
+  ZendEngine2/zend_closures.c
+  ZendEngine2/zend_compile.c
+  ZendEngine2/zend_constants.c
+  ZendEngine2/zend_exceptions.c
+  ZendEngine2/zend_execute.c
+  ZendEngine2/zend_execute_API.c
+  ZendEngine2/zend_hash.c
+  ZendEngine2/zend_ini.c
+  ZendEngine2/zend_ini_parser.y
+  ZendEngine2/zend_language_parser.y
+  ZendEngine2/zend_language_scanner.c
+  ZendEngine2/zend_language_scanner.l
+  ZendEngine2/zend_language_scanner_defs.h
+  ZendEngine2/zend_object_handlers.c
+  ZendEngine2/zend_operators.c
+  ZendEngine2/zend_operators.h
+  ZendEngine2/zend_unicode.h
+  ZendEngine2/zend_variables.c
+  ZendEngine2/zend_vm_def.h
+  ZendEngine2/zend_vm_execute.h
+  ext/calendar/calendar.c
+  ext/com_dotnet/com_variant.c
+  ext/date/php_date.c
+  ext/dom/php_dom.c
+  ext/gettext/gettext.c
+  ext/iconv/iconv.c
+  ext/libxml/libxml.c
+  ext/libxml/php_libxml.h
+  ext/oci8/oci8.c
+  ext/oci8/oci8_collection.c
+  ext/oci8/oci8_interface.c
+  ext/oci8/oci8_lob.c
+  ext/oci8/oci8_statement.c
+  ext/pcre/php_pcre.c
+  ext/pcre/php_pcre.h
+  ext/pdo/pdo_dbh.c
+  ext/pdo/pdo_stmt.c
+  ext/reflection/php_reflection.c
+  ext/session/mod_files.c
+  ext/session/session.c
+  ext/simplexml/simplexml.c
+  ext/soap/php_encoding.c
+  ext/soap/php_http.c
+  ext/soap/php_packet_soap.c
+  ext/soap/soap.c
+  ext/spl/php_spl.c
+  ext/spl/spl_array.c
+  ext/spl/spl_directory.c
+  ext/spl/spl_dllist.c
+  ext/spl/spl_engine.h
+  ext/spl/spl_functions.c
+  ext/spl/spl_heap.c
+  ext/spl/spl_iterators.c
+  ext/spl/spl_observer.c
+  ext/sqlite/sqlite.c
+  ext/standard/array.c
+  ext/standard/basic_functions.c
+  ext/standard/dir.c
+  ext/standard/file.c
+  ext/standard/formatted_print.c
+  ext/standard/head.c
+  ext/standard/html.c
+  ext/standard/http_fopen_wrapper.c
+  ext/standard/incomplete_class.c
+  ext/standard/link.c
+  ext/standard/php_incomplete_class.h
+  ext/standard/proc_open.c
+  ext/standard/streamsfuncs.c
+  ext/standard/string.c
+  ext/standard/type.c
+  ext/standard/uniqid.c
+  ext/standard/var.c
+  ext/standard/var_unserializer.c
+  ext/standard/var_unserializer.re
+  ext/tidy/tidy.c
+  ext/tokenizer/tokenizer.c
+  ext/xml/xml.c
+  ext/xmlreader/php_xmlreader.c
+  main/SAPI.c
+  main/php_variables.c
+  main/rfc1867.c
+  main/spprintf.c
+  main/streams/streams.c:
+  - Removed:
+ - UG(unicode) checks
+ - pcre_cache_entry.unicode_mode
+  - Changed:
+ - ZEND_STR_TYPE - IS_UNICODE
+ - convert_to_text - convert_to_unicode
+ - convert_to_text_ex - convert_to_unicode_ex
+  
+  (Felipe, Steph)
+
+2009-03-26  Pierre-Alain Joye  pierre@gmail.com
+
+* php.ini-development
+  php.ini-production:
+  -  update extension=
+
+* (PHP_5_3)
+  php.ini-development
+  php.ini-production:
+  - update extension=
+
+2009-03-26  Dmitry Stogov  dmi...@zend.com
+
+* (PHP_5_3)
+  NEWS
+  ZendEngine2/zend_stream.c
+  ZendEngine2/zend_stream.c
+  ZendEngine2/tests/bug47596.phpt
+  ZendEngine2/tests/bug47596.phpt
+  ZendEngine2/tests/bug47596.phpt:
+  Fixed bug #47596 (Bus error on parsing file)
+
+2009-03-26  Felipe Pena  felipe...@gmail.com
+
+* ext/pdo/tests/bug47769.phpt
+  ext/pdo/tests/bug47769.phpt:
+  - Fix typo
+
+* (PHP_5_3)
+  NEWS
+  ext/pdo/pdo_dbh.c
+  ext/pdo/tests/bug47769.phpt:
+  MFH: - Fixed bug #47769 (Strange extends PDO)
+
+* ext/pdo/pdo_dbh.c
+  ext/pdo/tests/bug47769.phpt
+  ext/pdo/tests/bug47769.phpt:
+  - Fixed bug #47769 (Strange extends PDO)
+
+2009-03-26  Dmitry Stogov

[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog

2009-03-26 Thread changelog 
changelog   Fri Mar 27 01:32:56 2009 UTC

  Modified files:  
/ZendEngine2ChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1462r2=1.1463diff_format=u
Index: ZendEngine2/ChangeLog
diff -u ZendEngine2/ChangeLog:1.1462 ZendEngine2/ChangeLog:1.1463
--- ZendEngine2/ChangeLog:1.1462Thu Mar 26 01:33:04 2009
+++ ZendEngine2/ChangeLog   Fri Mar 27 01:32:56 2009
@@ -1,3 +1,96 @@
+2009-03-26  Felipe Pena  felipe...@gmail.com
+
+* zend_constants.c
+  zend_hash.c
+  zend_object_handlers.c
+  zend_operators.c:
+  - Removed unused variables
+
+* zend.c
+  zend.h
+  zend_API.c
+  zend_API.h
+  zend_builtin_functions.c
+  zend_closures.c
+  zend_compile.c
+  zend_constants.c
+  zend_exceptions.c
+  zend_execute.c
+  zend_execute_API.c
+  zend_hash.c
+  zend_ini.c
+  zend_ini_parser.y
+  zend_language_parser.y
+  zend_language_scanner.c
+  zend_language_scanner.l
+  zend_language_scanner_defs.h
+  zend_object_handlers.c
+  zend_operators.c
+  zend_operators.h
+  zend_unicode.h
+  zend_variables.c
+  zend_vm_def.h
+  zend_vm_execute.h:
+  - Removed:
+ - UG(unicode) checks
+ - pcre_cache_entry.unicode_mode
+  - Changed:
+ - ZEND_STR_TYPE - IS_UNICODE
+ - convert_to_text - convert_to_unicode
+ - convert_to_text_ex - convert_to_unicode_ex
+  
+  (Felipe, Steph)
+
+2009-03-26  Dmitry Stogov  dmi...@zend.com
+
+* zend_stream.c
+  zend_stream.c
+  tests/bug47596.phpt:
+  Fixed bug #47596 (Bus error on parsing file)
+
+* tests/bug47596.phpt
+  tests/bug47596.phpt:
+  
+  file bug47596.phpt was initially added on branch PHP_5_3.
+
+* zend_language_parser.y
+  zend_language_parser.y
+  zend_language_scanner.c
+  zend_language_scanner.c
+  zend_language_scanner.l
+  zend_language_scanner.l
+  zend_language_scanner_defs.h
+  zend_language_scanner_defs.h
+  tests/bug47516.phpt:
+  Fixed bug #47516 (nowdoc can not be embed in heredoc but can be embed in
+  double quote)
+
+* tests/bug47516.phpt
+  tests/bug47516.phpt:
+  
+  file bug47516.phpt was initially added on branch PHP_5_3.
+
+* zend.c
+  zend.c
+  tests/bug47714.phpt
+  tests/bug47714.phpt
+  tests/bug47714.phpt:
+  Fixed bug #47714 (autoloading classes inside exception_handler leads to
+  crashes)
+
+* zend_vm_def.h
+  zend_vm_def.h
+  zend_vm_execute.h
+  zend_vm_execute.h
+  tests/bug47771.phpt:
+  Fixed bug #47771 (Exception during object construction from arg call 
calls
+  object's destructor)
+
+* tests/bug47771.phpt
+  tests/bug47771.phpt:
+  
+  file bug47771.phpt was initially added on branch PHP_5_3.
+
 2009-03-25  Dmitry Stogov  dmi...@zend.com
 
 * zend_globals.h
@@ -28222,7 +28315,7 @@
 2003-06-10  Jani Taskinen  sni...@iki.fi
 
 * zend_multiply.h:
-  - Missing $Id: ChangeLog,v 1.1462 2009/03/26 01:33:04 changelog Exp $ tag
+  - Missing $Id: ChangeLog,v 1.1463 2009/03/27 01:32:56 changelog Exp $ tag
 
 2003-06-10  James Cox  ja...@imajes.info
 
@@ -29946,7 +30039,7 @@
   zend_types.h
   zend_variables.c
   zend_variables.h:
-  - Added some missing CVS $Id: ChangeLog,v 1.1462 2009/03/26 01:33:04 
changelog Exp $ tags, headers and footers.
+  - Added some missing CVS $Id: ChangeLog,v 1.1463 2009/03/27 01:32:56 
changelog Exp $ tags, headers and footers.
 
 2003-01-30  Ilia Alshanetsky  i...@prohost.org

[PHP-CVS] cvs: php-src /ext/pdo pdo_dbh.c /ext/pdo/tests bug47769.phpt

2009-03-26 Thread Felipe Pena 
felipe  Thu Mar 26 12:51:30 2009 UTC

  Added files: 
/php-src/ext/pdo/tests  bug47769.phpt 

  Modified files:  
/php-src/ext/pdopdo_dbh.c 
  Log:
  - Fixed bug #47769 (Strange extends PDO)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.165r2=1.166diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.165 php-src/ext/pdo/pdo_dbh.c:1.166
--- php-src/ext/pdo/pdo_dbh.c:1.165 Wed Mar 25 12:05:51 2009
+++ php-src/ext/pdo/pdo_dbh.c   Thu Mar 26 12:51:30 2009
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pdo_dbh.c,v 1.165 2009/03/25 12:05:51 felipe Exp $ */
+/* $Id: pdo_dbh.c,v 1.166 2009/03/26 12:51:30 felipe Exp $ */
 
 /* The PDO Database Handle Class */
 
@@ -1342,8 +1342,7 @@
 
lc_method_name = zend_u_str_tolower_dup(ztype, method_name, method_len);
 
-   if (zend_u_hash_find(dbh-ce-function_table, ztype, lc_method_name,
-   method_len+1, (void**)fbc) == FAILURE) {
+   if ((fbc = std_object_handlers.get_method(object_pp, method_name, 
method_len TSRMLS_CC)) == NULL) {
/* not a pre-defined method, nor a user-defined method; check
 * the driver specific methods */
if (!dbh-cls_methods[PDO_DBH_DRIVER_METHOD_KIND_DBH]) {
@@ -1356,20 +1355,13 @@
 
if 
(zend_u_hash_find(dbh-cls_methods[PDO_DBH_DRIVER_METHOD_KIND_DBH],
ztype, lc_method_name, method_len+1, 
(void**)fbc) == FAILURE) {
-
if (!fbc) {
fbc = NULL;
}
-   goto out;
}
-   /* got it */
}
 
 out:
-   if (!fbc  std_object_handlers.get_method) {
-   fbc = std_object_handlers.get_method(object_pp, method_name, 
method_len TSRMLS_CC);
-   }
-
pdo_zstr_efree(lc_method_name);
return fbc;
 }

http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/tests/bug47769.phpt?view=markuprev=1.1
Index: php-src/ext/pdo/tests/bug47769.phpt
+++ php-src/ext/pdo/tests/bug47769.phpt
--TEST--
Bug #47769 (Strange extends PDO)
--FILE--
?php

class test extends PDO
{
protected function isProtected() {
echo this is a protected method.\n;
}
private function isPrivate() {
echo this is a private method.\n;
}

public function quote($str, $paramtype = NULL) {
$this-isProtected();
$this-isPrivate();
print $str .\n;
}
}

$test = new test('sqlite:memory');
$test-quote('foo');
$test-isProtected();

?
--EXPECTF--
this is a protected method.
this is a private method.
foo

Fatal error: Call to protected method test::isProtected() from context '' in %s 
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 /ext/pdo pdo_dbh.c /ext/pdo/tests bug47769.phpt

2009-03-26 Thread Felipe Pena 
felipe  Thu Mar 26 12:53:39 2009 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/pdo/tests  bug47769.phpt 

  Modified files:  
/php-srcNEWS 
/php-src/ext/pdopdo_dbh.c 
  Log:
  MFH: - Fixed bug #47769 (Strange extends PDO)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.537r2=1.2027.2.547.2.965.2.538diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.537 
php-src/NEWS:1.2027.2.547.2.965.2.538
--- php-src/NEWS:1.2027.2.547.2.965.2.537   Thu Mar 26 12:37:52 2009
+++ php-src/NEWSThu Mar 26 12:53:39 2009
@@ -5,6 +5,7 @@
   (Matteo)
 - Fixed bug #47771 (Exception during object construction from arg call calls
   object's destructor). (Dmitry)
+- Fixed bug #47769 (Strange extends PDO). (Felipe)
 - Fixed bug #47714 (autoloading classes inside exception_handler leads to
   crashes). (Dmitry)
 - Fixed bug #47699 (autoload and late static binding). (Dmitry)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.31.2.17.2.22r2=1.82.2.31.2.17.2.23diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.22 
php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.23
--- php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.22   Tue Feb 17 14:42:26 2009
+++ php-src/ext/pdo/pdo_dbh.c   Thu Mar 26 12:53:39 2009
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: pdo_dbh.c,v 1.82.2.31.2.17.2.22 2009/02/17 14:42:26 johannes Exp $ */
+/* $Id: pdo_dbh.c,v 1.82.2.31.2.17.2.23 2009/03/26 12:53:39 felipe Exp $ */
 
 /* The PDO Database Handle Class */
 
@@ -1333,7 +1333,7 @@
lc_method_name = emalloc(method_len + 1);
zend_str_tolower_copy(lc_method_name, method_name, method_len);
 
-   if (zend_hash_find(dbh-ce-function_table, lc_method_name, 
method_len+1, (void**)fbc) == FAILURE) {
+   if ((fbc = std_object_handlers.get_method(object_pp, method_name, 
method_len TSRMLS_CC)) == NULL) {
/* not a pre-defined method, nor a user-defined method; check
 * the driver specific methods */
if (!dbh-cls_methods[PDO_DBH_DRIVER_METHOD_KIND_DBH]) {
@@ -1346,23 +1346,13 @@
 
if 
(zend_hash_find(dbh-cls_methods[PDO_DBH_DRIVER_METHOD_KIND_DBH],
lc_method_name, method_len+1, (void**)fbc) == 
FAILURE) {
-
if (!fbc) {
fbc = NULL;
}
-
-   goto out;
}
-   /* got it */
}
 
 out:
-   if (!fbc) {
-   if (std_object_handlers.get_method) {
-   fbc = std_object_handlers.get_method(object_pp, 
method_name, method_len TSRMLS_CC);
-   }
-   }
-
efree(lc_method_name);
return fbc;
 }

http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/tests/bug47769.phpt?view=markuprev=1.1
Index: php-src/ext/pdo/tests/bug47769.phpt
+++ php-src/ext/pdo/tests/bug47769.phpt
--TEST--
Bug #47769 (Strange extends PDO)
--FILE--
?php

class test extends PDO
{
protected function isProtected() {
echo this is a protected method.\n;
}
private function isPrivate() {
echo this is a private method.\n;
}

public function quote($str, $paramtype = NULL) {
$this-isProtected();
$this-isPrivate();
print $str .\n;
}
}

$test = new test('sqlite:memory');
$test-quote('foo');
$test-isProtected();

?
--EXPECTF--
this is a protected method.
this is a private method.
foo

Fatal error: Call to protected method test::isProtected() from context '' in %s 
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 /ext/pdo/tests bug47769.phpt

2009-03-26 Thread Felipe Pena 
felipe  Thu Mar 26 13:54:53 2009 UTC

  Modified files:  
/php-src/ext/pdo/tests  bug47769.phpt 
  Log:
  - Fix typo
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/tests/bug47769.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/pdo/tests/bug47769.phpt
diff -u php-src/ext/pdo/tests/bug47769.phpt:1.1 
php-src/ext/pdo/tests/bug47769.phpt:1.2
--- php-src/ext/pdo/tests/bug47769.phpt:1.1 Thu Mar 26 12:51:30 2009
+++ php-src/ext/pdo/tests/bug47769.phpt Thu Mar 26 13:54:53 2009
@@ -19,7 +19,7 @@
}
 }
 
-$test = new test('sqlite:memory');
+$test = new test('sqlite::memory:');
 $test-quote('foo');
 $test-isProtected();
 



-- 
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/pdo/tests bug47769.phpt

2009-03-26 Thread Felipe Pena 
felipe  Thu Mar 26 13:55:06 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/pdo/tests  bug47769.phpt 
  Log:
  - Fix typo
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/tests/bug47769.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/pdo/tests/bug47769.phpt
diff -u php-src/ext/pdo/tests/bug47769.phpt:1.1.2.2 
php-src/ext/pdo/tests/bug47769.phpt:1.1.2.3
--- php-src/ext/pdo/tests/bug47769.phpt:1.1.2.2 Thu Mar 26 12:53:39 2009
+++ php-src/ext/pdo/tests/bug47769.phpt Thu Mar 26 13:55:06 2009
@@ -19,7 +19,7 @@
}
 }
 
-$test = new test('sqlite:memory');
+$test = new test('sqlite::memory:');
 $test-quote('foo');
 $test-isProtected();
 



-- 
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) / php.ini-development php.ini-production

2009-03-26 Thread Pierre-Alain Joye 
pajoye  Thu Mar 26 18:45:37 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcphp.ini-development php.ini-production 
  Log:
  - update extension=
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-development?r1=1.1.2.4r2=1.1.2.5diff_format=u
Index: php-src/php.ini-development
diff -u php-src/php.ini-development:1.1.2.4 php-src/php.ini-development:1.1.2.5
--- php-src/php.ini-development:1.1.2.4 Thu Mar 26 01:38:53 2009
+++ php-src/php.ini-development Thu Mar 26 18:45:37 2009
@@ -940,31 +940,24 @@
 ;extension=php_bz2.dll
 ;extension=php_curl.dll
 ;extension=php_dba.dll
-;extension=php_dbase.dll
 ;extension=php_exif.dll
 ;extension=php_fileinfo.dll
-;extension=php_fdf.dll
 ;extension=php_gd2.dll
 ;extension=php_gettext.dll
 ;extension=php_gmp.dll
-;extension=php_ifx.dll
 ;extension=php_intl.dll
 ;extension=php_imap.dll
 ;extension=php_interbase.dll
 ;extension=php_ldap.dll
 ;extension=php_mbstring.dll
-;extension=php_mcrypt.dll
-;extension=php_mhash.dll
 ;extension=php_mime_magic.dll
 ;extension=php_ming.dll
-;extension=php_msql.dll
 ;extension=php_mssql.dll
 ;extension=php_mysql.dll
 ;extension=php_mysqli.dll
 ;extension=php_oci8.dll  ; Use with Oracle 10gR2 Instant Client
 ;extension=php_oci8_11g.dll  ; Use with Oracle 11g Instant Client
 ;extension=php_openssl.dll
-;extension=php_pdo.dll
 ;extension=php_pdo_firebird.dll
 ;extension=php_pdo_mssql.dll
 ;extension=php_pdo_mysql.dll
http://cvs.php.net/viewvc.cgi/php-src/php.ini-production?r1=1.1.2.4r2=1.1.2.5diff_format=u
Index: php-src/php.ini-production
diff -u php-src/php.ini-production:1.1.2.4 php-src/php.ini-production:1.1.2.5
--- php-src/php.ini-production:1.1.2.4  Thu Mar 26 01:38:53 2009
+++ php-src/php.ini-production  Thu Mar 26 18:45:37 2009
@@ -940,31 +940,24 @@
 ;extension=php_bz2.dll
 ;extension=php_curl.dll
 ;extension=php_dba.dll
-;extension=php_dbase.dll
 ;extension=php_exif.dll
 ;extension=php_fileinfo.dll
-;extension=php_fdf.dll
 ;extension=php_gd2.dll
 ;extension=php_gettext.dll
 ;extension=php_gmp.dll
-;extension=php_ifx.dll
 ;extension=php_intl.dll
 ;extension=php_imap.dll
 ;extension=php_interbase.dll
 ;extension=php_ldap.dll
 ;extension=php_mbstring.dll
-;extension=php_mcrypt.dll
-;extension=php_mhash.dll
 ;extension=php_mime_magic.dll
 ;extension=php_ming.dll
-;extension=php_msql.dll
 ;extension=php_mssql.dll
 ;extension=php_mysql.dll
 ;extension=php_mysqli.dll
 ;extension=php_oci8.dll  ; Use with Oracle 10gR2 Instant Client
 ;extension=php_oci8_11g.dll  ; Use with Oracle 11g Instant Client
 ;extension=php_openssl.dll
-;extension=php_pdo.dll
 ;extension=php_pdo_firebird.dll
 ;extension=php_pdo_mssql.dll
 ;extension=php_pdo_mysql.dll



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

[PHP-CVS] cvs: php-src / php.ini-development php.ini-production

2009-03-26 Thread Pierre-Alain Joye 
pajoye  Thu Mar 26 18:53:42 2009 UTC

  Modified files:  
/php-srcphp.ini-development php.ini-production 
  Log:
  -  update extension=
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-development?r1=1.3r2=1.4diff_format=u
Index: php-src/php.ini-development
diff -u php-src/php.ini-development:1.3 php-src/php.ini-development:1.4
--- php-src/php.ini-development:1.3 Thu Mar 26 01:39:10 2009
+++ php-src/php.ini-development Thu Mar 26 18:53:42 2009
@@ -940,31 +940,24 @@
 ;extension=php_bz2.dll
 ;extension=php_curl.dll
 ;extension=php_dba.dll
-;extension=php_dbase.dll
 ;extension=php_exif.dll
 ;extension=php_fileinfo.dll
-;extension=php_fdf.dll
 ;extension=php_gd2.dll
 ;extension=php_gettext.dll
 ;extension=php_gmp.dll
-;extension=php_ifx.dll
 ;extension=php_intl.dll
 ;extension=php_imap.dll
 ;extension=php_interbase.dll
 ;extension=php_ldap.dll
 ;extension=php_mbstring.dll
-;extension=php_mcrypt.dll
-;extension=php_mhash.dll
 ;extension=php_mime_magic.dll
 ;extension=php_ming.dll
-;extension=php_msql.dll
 ;extension=php_mssql.dll
 ;extension=php_mysql.dll
 ;extension=php_mysqli.dll
 ;extension=php_oci8.dll  ; Use with Oracle 10gR2 Instant Client
 ;extension=php_oci8_11g.dll  ; Use with Oracle 11g Instant Client
 ;extension=php_openssl.dll
-;extension=php_pdo.dll
 ;extension=php_pdo_firebird.dll
 ;extension=php_pdo_mssql.dll
 ;extension=php_pdo_mysql.dll
http://cvs.php.net/viewvc.cgi/php-src/php.ini-production?r1=1.3r2=1.4diff_format=u
Index: php-src/php.ini-production
diff -u php-src/php.ini-production:1.3 php-src/php.ini-production:1.4
--- php-src/php.ini-production:1.3  Thu Mar 26 01:39:10 2009
+++ php-src/php.ini-production  Thu Mar 26 18:53:42 2009
@@ -940,31 +940,24 @@
 ;extension=php_bz2.dll
 ;extension=php_curl.dll
 ;extension=php_dba.dll
-;extension=php_dbase.dll
 ;extension=php_exif.dll
 ;extension=php_fileinfo.dll
-;extension=php_fdf.dll
 ;extension=php_gd2.dll
 ;extension=php_gettext.dll
 ;extension=php_gmp.dll
-;extension=php_ifx.dll
 ;extension=php_intl.dll
 ;extension=php_imap.dll
 ;extension=php_interbase.dll
 ;extension=php_ldap.dll
 ;extension=php_mbstring.dll
-;extension=php_mcrypt.dll
-;extension=php_mhash.dll
 ;extension=php_mime_magic.dll
 ;extension=php_ming.dll
-;extension=php_msql.dll
 ;extension=php_mssql.dll
 ;extension=php_mysql.dll
 ;extension=php_mysqli.dll
 ;extension=php_oci8.dll  ; Use with Oracle 10gR2 Instant Client
 ;extension=php_oci8_11g.dll  ; Use with Oracle 11g Instant Client
 ;extension=php_openssl.dll
-;extension=php_pdo.dll
 ;extension=php_pdo_firebird.dll
 ;extension=php_pdo_mssql.dll
 ;extension=php_pdo_mysql.dll



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

[PHP-CVS] cvs: php-src /ext/date php_date.c /ext/libxml libxml.c /ext/soap soap.c /ext/standard string.c var_unserializer.c var_unserializer.re ZendEngine2 zend_constants.c zend_hash.c zend_object

2009-03-26 Thread Felipe Pena 
felipe  Thu Mar 26 22:16:48 2009 UTC

  Modified files:  
/ZendEngine2zend_constants.c zend_hash.c zend_object_handlers.c 
zend_operators.c 
/php-src/ext/date   php_date.c 
/php-src/ext/libxml libxml.c 
/php-src/ext/soap   soap.c 
/php-src/ext/standard   string.c var_unserializer.c 
var_unserializer.re 
  Log:
  - Removed unused variables
  
  http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_constants.c?r1=1.118r2=1.119diff_format=u
Index: ZendEngine2/zend_constants.c
diff -u ZendEngine2/zend_constants.c:1.118 ZendEngine2/zend_constants.c:1.119
--- ZendEngine2/zend_constants.c:1.118  Thu Mar 26 20:01:38 2009
+++ ZendEngine2/zend_constants.cThu Mar 26 22:16:47 2009
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: zend_constants.c,v 1.118 2009/03/26 20:01:38 felipe Exp $ */
+/* $Id: zend_constants.c,v 1.119 2009/03/26 22:16:47 felipe Exp $ */
 
 #include zend.h
 #include zend_constants.h
@@ -37,8 +37,6 @@
 
 void copy_zend_constant(zend_constant *c) /* {{{ */
 {
-   TSRMLS_FETCH();
-
c-name.u = zend_ustrndup(c-name.u, c-name_len - 1);
 
if (!(c-flags  CONST_PERSISTENT)) {
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_hash.c?r1=1.163r2=1.164diff_format=u
Index: ZendEngine2/zend_hash.c
diff -u ZendEngine2/zend_hash.c:1.163 ZendEngine2/zend_hash.c:1.164
--- ZendEngine2/zend_hash.c:1.163   Thu Mar 26 20:01:38 2009
+++ ZendEngine2/zend_hash.c Thu Mar 26 22:16:47 2009
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: zend_hash.c,v 1.163 2009/03/26 20:01:38 felipe Exp $ */
+/* $Id: zend_hash.c,v 1.164 2009/03/26 22:16:47 felipe Exp $ */
 
 #include zend.h
 #include zend_operators.h
@@ -333,7 +333,6 @@
 {
zstr key;
int ret;
-   TSRMLS_FETCH();
 
key.u = zend_ascii_to_unicode(arKey, nKeyLength ZEND_FILE_LINE_CC);
ret = _zend_u_hash_add_or_update(ht, IS_UNICODE, key, nKeyLength, 
pData, nDataSize, pDest, flag ZEND_FILE_LINE_CC);
@@ -673,7 +672,6 @@
 {
zstr key;
int ret;
-   TSRMLS_FETCH();
 
key.u = zend_ascii_to_unicode(arKey, nKeyLength ZEND_FILE_LINE_CC);
ret = zend_u_hash_del_key_or_index(ht, IS_UNICODE, key, nKeyLength, 0, 
HASH_DEL_KEY);
@@ -1135,7 +1133,6 @@
 {
zstr key;
int ret;
-   TSRMLS_FETCH();
 
key.u = zend_ascii_to_unicode(arKey, nKeyLength ZEND_FILE_LINE_CC);
ret = zend_u_hash_find(ht, IS_UNICODE, key, nKeyLength, pData);
@@ -1268,7 +1265,6 @@
 {
zstr key;
int ret;
-   TSRMLS_FETCH();
 
key.u = zend_ascii_to_unicode(arKey, nKeyLength ZEND_FILE_LINE_CC);
ret = zend_u_hash_exists(ht, IS_UNICODE, key, nKeyLength);
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_object_handlers.c?r1=1.213r2=1.214diff_format=u
Index: ZendEngine2/zend_object_handlers.c
diff -u ZendEngine2/zend_object_handlers.c:1.213 
ZendEngine2/zend_object_handlers.c:1.214
--- ZendEngine2/zend_object_handlers.c:1.213Thu Mar 26 20:01:38 2009
+++ ZendEngine2/zend_object_handlers.c  Thu Mar 26 22:16:47 2009
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: zend_object_handlers.c,v 1.213 2009/03/26 20:01:38 felipe Exp $ */
+/* $Id: zend_object_handlers.c,v 1.214 2009/03/26 22:16:47 felipe Exp $ */
 
 #include zend.h
 #include zend_globals.h
@@ -785,7 +785,6 @@
 static inline union _zend_function *zend_get_user_call_function(zend_object 
*zobj, zstr method_name, int method_len) /* {{{ */
 {
zend_internal_function *call_user_call = 
emalloc(sizeof(zend_internal_function));
-   TSRMLS_FETCH();
 
call_user_call-type = ZEND_INTERNAL_FUNCTION;
call_user_call-module = zobj-ce-module;
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_operators.c?r1=1.303r2=1.304diff_format=u
Index: ZendEngine2/zend_operators.c
diff -u ZendEngine2/zend_operators.c:1.303 ZendEngine2/zend_operators.c:1.304
--- ZendEngine2/zend_operators.c:1.303  Thu Mar 26 20:01:38 2009
+++ ZendEngine2/zend_operators.cThu Mar 26 22:16:47 2009
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: zend_operators.c,v 1.303 2009/03/26 20:01:38 felipe Exp $ */
+/* $Id: zend_operators.c,v 1.304 2009/03/26 22:16:47 felipe Exp $ */
 
 #include ctype.h
 
@@ -2330,8 +2330,6 @@
 int ch;
 
if (Z_USTRLEN_P(str) == 0) {
-   TSRMLS_FETCH();
-
USTR_FREE(Z_USTRVAL_P(str));
ZVAL_ASCII_STRINGL(str, 1, sizeof(1)-1, 1);
return;
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.220r2=1.221diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.220 php-src/ext/date/php_date.c:1.221
--- php-src/ext/date/php_date.c:1.220   Thu Mar 26 20:01:38 2009

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

2009-03-26 Thread Felipe Pena 
felipe  Thu Mar 26 22:30:05 2009 UTC

  Modified files:  
/php-src/ext/standard   syslog.c 
  Log:
  - Removed unused declaration
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/syslog.c?r1=1.62r2=1.63diff_format=u
Index: php-src/ext/standard/syslog.c
diff -u php-src/ext/standard/syslog.c:1.62 php-src/ext/standard/syslog.c:1.63
--- php-src/ext/standard/syslog.c:1.62  Tue Mar 10 23:39:40 2009
+++ php-src/ext/standard/syslog.c   Thu Mar 26 22:30:05 2009
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: syslog.c,v 1.62 2009/03/10 23:39:40 helly Exp $ */
+/* $Id: syslog.c,v 1.63 2009/03/26 22:30:05 felipe Exp $ */
 
 #include php.h
 
@@ -36,8 +36,6 @@
 #include basic_functions.h
 #include php_ext_syslog.h
 
-static void start_syslog(TSRMLS_D);
-
 /* {{{ PHP_MINIT_FUNCTION
  */
 PHP_MINIT_FUNCTION(syslog)



-- 
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/pcntl/tests signal_closure_handler.phpt /ext/standard basic_functions.c /ext/standard/tests/general_functions bug41037.phpt closures_002.phpt ZendEngine2 zend_c

2009-03-26 Thread Arnaud Le Blanc 
lbarnaudFri Mar 27 02:32:58 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/ZendEngine2zend_compile.c 
/php-src/ext/standard   basic_functions.c 
/ZendEngine2/tests  bug43027.phpt jump12.phpt 
/php-src/ext/pcntl/testssignal_closure_handler.phpt 
/php-src/ext/standard/tests/general_functions   bug41037.phpt 
closures_002.phpt 
  Log:
  Removed deprecation warning for ticks
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_compile.c?r1=1.647.2.27.2.41.2.103r2=1.647.2.27.2.41.2.104diff_format=u
Index: ZendEngine2/zend_compile.c
diff -u ZendEngine2/zend_compile.c:1.647.2.27.2.41.2.103 
ZendEngine2/zend_compile.c:1.647.2.27.2.41.2.104
--- ZendEngine2/zend_compile.c:1.647.2.27.2.41.2.103Tue Mar 10 10:01:44 2009
+++ ZendEngine2/zend_compile.c  Fri Mar 27 02:32:56 2009
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: zend_compile.c,v 1.647.2.27.2.41.2.103 2009/03/10 10:01:44 dmitry Exp 
$ */
+/* $Id: zend_compile.c,v 1.647.2.27.2.41.2.104 2009/03/27 02:32:56 lbarnaud 
Exp $ */
 
 #include zend_language_parser.h
 #include zend.h
@@ -4594,8 +4594,6 @@
if (!zend_binary_strcasecmp(var-u.constant.value.str.val, 
var-u.constant.value.str.len, ticks, sizeof(ticks)-1)) {
convert_to_long(val-u.constant);
CG(declarables).ticks = val-u.constant;
-   
-   zend_error(E_DEPRECATED, Ticks is deprecated and will be 
removed in PHP 6);
 #ifdef ZEND_MULTIBYTE
} else if (!zend_binary_strcasecmp(var-u.constant.value.str.val, 
var-u.constant.value.str.len, encoding, sizeof(encoding)-1)) {
zend_encoding *new_encoding, *old_encoding;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.86r2=1.725.2.31.2.64.2.87diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.86 
php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.87
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.86 Mon Jan 19 
02:35:21 2009
+++ php-src/ext/standard/basic_functions.c  Fri Mar 27 02:32:56 2009
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.86 2009/01/19 02:35:21 pajoye 
Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.87 2009/03/27 02:32:56 lbarnaud 
Exp $ */
 
 #include php.h
 #include php_streams.h
@@ -5640,8 +5640,6 @@
if (tick_fe.arg_count  1) {
WRONG_PARAM_COUNT;
}
-   
-   php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, Ticks is deprecated and 
will be removed in PHP 6);
 
tick_fe.arguments = (zval **) safe_emalloc(sizeof(zval *), 
tick_fe.arg_count, 0);
 
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/bug43027.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: ZendEngine2/tests/bug43027.phpt
diff -u ZendEngine2/tests/bug43027.phpt:1.1.2.2 
ZendEngine2/tests/bug43027.phpt:1.1.2.3
--- ZendEngine2/tests/bug43027.phpt:1.1.2.2 Thu Jul 17 19:29:34 2008
+++ ZendEngine2/tests/bug43027.phpt Fri Mar 27 02:32:57 2009
@@ -7,5 +7,4 @@
 echo ok\n;
 ?
 --EXPECTF--
-Deprecated: Ticks is deprecated and will be removed in PHP 6 in %s on line %d
 ok
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/jump12.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: ZendEngine2/tests/jump12.phpt
diff -u ZendEngine2/tests/jump12.phpt:1.1.2.3 
ZendEngine2/tests/jump12.phpt:1.1.2.4
--- ZendEngine2/tests/jump12.phpt:1.1.2.3   Thu Jul 17 19:29:34 2008
+++ ZendEngine2/tests/jump12.phpt   Fri Mar 27 02:32:57 2009
@@ -14,7 +14,6 @@
 goto b;
 ?
 --EXPECTF--
-Deprecated: Ticks is deprecated and will be removed in PHP 6 in %s on line %d
 ok!
 ok!
 ok!
http://cvs.php.net/viewvc.cgi/php-src/ext/pcntl/tests/signal_closure_handler.phpt?r1=1.1.2.4r2=1.1.2.5diff_format=u
Index: php-src/ext/pcntl/tests/signal_closure_handler.phpt
diff -u php-src/ext/pcntl/tests/signal_closure_handler.phpt:1.1.2.4 
php-src/ext/pcntl/tests/signal_closure_handler.phpt:1.1.2.5
--- php-src/ext/pcntl/tests/signal_closure_handler.phpt:1.1.2.4 Tue Aug  5 
15:12:19 2008
+++ php-src/ext/pcntl/tests/signal_closure_handler.phpt Fri Mar 27 02:32:57 2009
@@ -20,7 +20,6 @@
 
 ?
 --EXPECTF--
-Deprecated: Ticks is deprecated and will be removed in PHP 6 in %s on line %d
 Start!
 Signal handler called!
 Done!
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/bug41037.phpt?r1=1.1.2.2.2.1r2=1.1.2.2.2.2diff_format=u
Index: php-src/ext/standard/tests/general_functions/bug41037.phpt
diff -u php-src/ext/standard/tests/general_functions/bug41037.phpt:1.1.2.2.2.1 
php-src/ext/standard/tests/general_functions/bug41037.phpt:1.1.2.2.2.2
--- php-src/ext/standard/tests/general_functions/bug41037.phpt:1.1.2.2.2.1  
Thu Jul 17 19:29:34 2008
+++

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

2009-03-26 Thread Arnaud Le Blanc 
lbarnaudFri Mar 27 02:33:44 2009 UTC

  Modified files:  
/php-src/main   main.c 
  Log:
  Fixed initialization of tick functions list in ZTS
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.794r2=1.795diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.794 php-src/main/main.c:1.795
--- php-src/main/main.c:1.794   Tue Mar 10 23:39:53 2009
+++ php-src/main/main.c Fri Mar 27 02:33:44 2009
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.794 2009/03/10 23:39:53 helly Exp $ */
+/* $Id: main.c,v 1.795 2009/03/27 02:33:44 lbarnaud Exp $ */
 
 /* {{{ includes
  */
@@ -1728,6 +1728,8 @@
 static void core_globals_ctor(php_core_globals *core_globals TSRMLS_DC)
 {
memset(core_globals, 0, sizeof(*core_globals));
+
+   php_startup_ticks(TSRMLS_C);
 }
 /* }}} */
 #endif
@@ -1754,6 +1756,8 @@
if (core_globals-allow_url_include_list) {
free(core_globals-allow_url_include_list);
}
+
+   php_shutdown_ticks(TSRMLS_C);
 }
 /* }}} */
 
@@ -1893,6 +1897,8 @@
 #ifdef PHP_WIN32
ts_allocate_id(php_win32_core_globals_id, 
sizeof(php_win32_core_globals), (ts_allocate_ctor) php_win32_core_globals_ctor, 
(ts_allocate_dtor) php_win32_core_globals_dtor);
 #endif
+#else
+   php_startup_ticks(TSRMLS_C);
 #endif
gc_globals_ctor(TSRMLS_C);
 
@@ -2050,11 +2056,6 @@
zend_set_utility_values(zuv);
php_startup_sapi_content_types(TSRMLS_C);
 
-   if (php_startup_ticks(TSRMLS_C) == FAILURE) {
-   php_printf(Unable to start PHP ticks\n);
-   return FAILURE;
-   }
-
/* startup extensions staticly compiled in */
if (php_register_internal_extensions_func(TSRMLS_C) == FAILURE) {
php_printf(Unable to start builtin modules\n);
@@ -2155,7 +2156,6 @@
WSACleanup();
 #endif
 
-   php_shutdown_ticks(TSRMLS_C);
sapi_flush(TSRMLS_C);
 
zend_shutdown(TSRMLS_C);



-- 
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) /main main.c

2009-03-26 Thread Arnaud Le Blanc 
lbarnaudFri Mar 27 02:34:06 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/main   main.c 
  Log:
  MFH: Fixed initialization of tick functions list in ZTS
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.57.2.46r2=1.640.2.23.2.57.2.47diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.57.2.46 
php-src/main/main.c:1.640.2.23.2.57.2.47
--- php-src/main/main.c:1.640.2.23.2.57.2.46Mon Feb  9 09:20:34 2009
+++ php-src/main/main.c Fri Mar 27 02:34:06 2009
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: main.c,v 1.640.2.23.2.57.2.46 2009/02/09 09:20:34 dmitry Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.57.2.47 2009/03/27 02:34:06 lbarnaud Exp $ */
 
 /* {{{ includes
  */
@@ -1623,6 +1623,8 @@
 static void core_globals_ctor(php_core_globals *core_globals TSRMLS_DC)
 {
memset(core_globals, 0, sizeof(*core_globals));
+
+   php_startup_ticks(TSRMLS_C);
 }
 /* }}} */
 #endif
@@ -1643,6 +1645,8 @@
if (core_globals-disable_classes) {
free(core_globals-disable_classes);
}
+
+   php_shutdown_ticks(TSRMLS_C);
 }
 /* }}} */
 
@@ -1783,6 +1787,8 @@
 #ifdef PHP_WIN32
ts_allocate_id(php_win32_core_globals_id, 
sizeof(php_win32_core_globals), (ts_allocate_ctor) php_win32_core_globals_ctor, 
(ts_allocate_dtor) php_win32_core_globals_dtor);
 #endif
+#else
+   php_startup_ticks(TSRMLS_C);
 #endif
gc_globals_ctor(TSRMLS_C);
 
@@ -1927,11 +1933,6 @@
zend_set_utility_values(zuv);
php_startup_sapi_content_types(TSRMLS_C);
 
-   if (php_startup_ticks(TSRMLS_C) == FAILURE) {
-   php_printf(Unable to start PHP ticks\n);
-   return FAILURE;
-   }
-
/* startup extensions staticly compiled in */
if (php_register_internal_extensions_func(TSRMLS_C) == FAILURE) {
php_printf(Unable to start builtin modules\n);
@@ -2032,7 +2033,6 @@
WSACleanup();
 #endif
 
-   php_shutdown_ticks(TSRMLS_C);
sapi_flush(TSRMLS_C);
 
zend_shutdown(TSRMLS_C);



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

[PHP-CVS] cvs: php-src /ext/standard/tests/filters filter_errors.inc

2009-03-26 Thread Arnaud Le Blanc 
lbarnaudFri Mar 27 02:35:10 2009 UTC

  Modified files:  
/php-src/ext/standard/tests/filters filter_errors.inc 
  Log:
  fix skip-if
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/filters/filter_errors.inc?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/standard/tests/filters/filter_errors.inc
diff -u php-src/ext/standard/tests/filters/filter_errors.inc:1.2 
php-src/ext/standard/tests/filters/filter_errors.inc:1.3
--- php-src/ext/standard/tests/filters/filter_errors.inc:1.2Thu Jan  8 
18:39:04 2009
+++ php-src/ext/standard/tests/filters/filter_errors.incFri Mar 27 
02:35:10 2009
@@ -1,6 +1,9 @@
 ?php
 
 function filter_errors_skipif($needle) {
+   if (!function_exists('fnmatch')) {
+   die('skip fnmatch() not available');
+   }
$filters = stream_get_filters();
foreach($filters as $filter) {
if (fnmatch($filter, $needle)) return;



-- 
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/filters filter_errors.inc

2009-03-26 Thread Arnaud Le Blanc 
lbarnaudFri Mar 27 02:35:37 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/standard/tests/filters filter_errors.inc 
  Log:
  MFH: fix skip-if
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/filters/filter_errors.inc?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/standard/tests/filters/filter_errors.inc
diff -u php-src/ext/standard/tests/filters/filter_errors.inc:1.1.2.3 
php-src/ext/standard/tests/filters/filter_errors.inc:1.1.2.4
--- php-src/ext/standard/tests/filters/filter_errors.inc:1.1.2.3Thu Jan 
 8 18:40:27 2009
+++ php-src/ext/standard/tests/filters/filter_errors.incFri Mar 27 
02:35:37 2009
@@ -1,6 +1,9 @@
 ?php
 
 function filter_errors_skipif($needle) {
+   if (!function_exists('fnmatch')) {
+   die('skip fnmatch() not available');
+   }
$filters = stream_get_filters();
foreach($filters as $filter) {
if (fnmatch($filter, $needle)) return;



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