Commit:    e4a8fa6a15d2aa8645d1ad4f4724cb1c628e6916
Author:    Xinchen Hui <larue...@php.net>         Tue, 9 Oct 2012 13:29:51 +0800
Parents:   931571260b28bec7c53e57803e03ee0c38e8595e 
6284ef112ef870b791b8dfab36a39c4664744cc5
Branches:  PHP-5.4

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=e4a8fa6a15d2aa8645d1ad4f4724cb1c628e6916

Log:
Merge branch 'PHP-5.3' into PHP-5.4

Changed paths:
  MM  Zend/zend_interfaces.c
  MM  Zend/zend_interfaces.h
  MM  Zend/zend_iterators.c
  MM  ext/com_dotnet/com_persist.c
  MM  ext/enchant/enchant.c
  MM  ext/pcntl/pcntl.c
  MM  ext/pdo/pdo.c
  MM  ext/pdo/pdo_dbh.c
  MM  ext/pdo/pdo_stmt.c
  MM  ext/pdo/php_pdo_driver.h
  MM  ext/pdo_mysql/mysql_driver.c
  MM  ext/pdo_mysql/mysql_statement.c
  MM  ext/pdo_mysql/pdo_mysql.c
  MM  ext/pdo_mysql/php_pdo_mysql_int.h
  MM  ext/pdo_oci/oci_driver.c
  MM  ext/pdo_odbc/pdo_odbc.c
  MM  ext/spl/php_spl.c
  MM  ext/spl/php_spl.h
  MM  ext/spl/spl_array.c
  MM  ext/spl/spl_directory.c
  MM  ext/spl/spl_functions.c
  MM  ext/spl/spl_functions.h
  MM  ext/spl/spl_iterators.c
  MM  ext/spl/spl_iterators.h
  MM  ext/spl/spl_observer.c
  MM  ext/standard/winver.h
  MM  main/php_streams.h
  MM  main/streams/glob_wrapper.c
  MM  main/streams/streams.c


Diff:
diff --cc Zend/zend_interfaces.c
index aee0d61,47dbe0b..aee0d61
mode 100755,100644..100644
--- a/Zend/zend_interfaces.c
+++ b/Zend/zend_interfaces.c
diff --cc Zend/zend_interfaces.h
index e3e3629,2b05bbd..e3e3629
mode 100755,100644..100644
--- a/Zend/zend_interfaces.h
+++ b/Zend/zend_interfaces.h
diff --cc Zend/zend_iterators.c
index d0572b2,1c5ba32..d0572b2
mode 100755,100644..100644
--- a/Zend/zend_iterators.c
+++ b/Zend/zend_iterators.c
diff --cc ext/com_dotnet/com_persist.c
index 7c035f6,fb94021..7c035f6
mode 100755,100644..100644
--- a/ext/com_dotnet/com_persist.c
+++ b/ext/com_dotnet/com_persist.c
diff --cc ext/enchant/enchant.c
index 357f3cb,dcc39e2..357f3cb
mode 100755,100644..100644
--- a/ext/enchant/enchant.c
+++ b/ext/enchant/enchant.c
diff --cc ext/pcntl/pcntl.c
index 8647e10,b840066..8647e10
mode 100755,100644..100644
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
diff --cc ext/pdo/pdo.c
index e0a1c3c,e1d8235..e0a1c3c
mode 100755,100644..100644
--- a/ext/pdo/pdo.c
+++ b/ext/pdo/pdo.c
diff --cc ext/pdo/pdo_dbh.c
index acdc0dd,4035b2b..acdc0dd
mode 100755,100644..100644
--- a/ext/pdo/pdo_dbh.c
+++ b/ext/pdo/pdo_dbh.c
diff --cc ext/pdo/pdo_stmt.c
index 31932eb,0cf0cf8..31932eb
mode 100755,100644..100644
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
diff --cc ext/pdo/php_pdo_driver.h
index b9c46ba,17b23a3..b9c46ba
mode 100755,100644..100644
--- a/ext/pdo/php_pdo_driver.h
+++ b/ext/pdo/php_pdo_driver.h
diff --cc ext/pdo_mysql/mysql_driver.c
index 5cf35b1,727357a..5cf35b1
mode 100755,100644..100644
--- a/ext/pdo_mysql/mysql_driver.c
+++ b/ext/pdo_mysql/mysql_driver.c
diff --cc ext/pdo_mysql/mysql_statement.c
index fc5ec51,115e74c..fc5ec51
mode 100755,100644..100644
--- a/ext/pdo_mysql/mysql_statement.c
+++ b/ext/pdo_mysql/mysql_statement.c
diff --cc ext/pdo_mysql/pdo_mysql.c
index ea69c3c,e8e215f..ea69c3c
mode 100755,100644..100644
--- a/ext/pdo_mysql/pdo_mysql.c
+++ b/ext/pdo_mysql/pdo_mysql.c
diff --cc ext/pdo_mysql/php_pdo_mysql_int.h
index 0b6d775,f8caa9f..0b6d775
mode 100755,100644..100644
--- a/ext/pdo_mysql/php_pdo_mysql_int.h
+++ b/ext/pdo_mysql/php_pdo_mysql_int.h
diff --cc ext/pdo_oci/oci_driver.c
index cb920ab,b3aa765..cb920ab
mode 100755,100644..100644
--- a/ext/pdo_oci/oci_driver.c
+++ b/ext/pdo_oci/oci_driver.c
diff --cc ext/pdo_odbc/pdo_odbc.c
index 72553c4,5c02f47..72553c4
mode 100755,100644..100644
--- a/ext/pdo_odbc/pdo_odbc.c
+++ b/ext/pdo_odbc/pdo_odbc.c
diff --cc ext/spl/php_spl.c
index cd00866,e2bd7cf..cd00866
mode 100755,100644..100644
--- a/ext/spl/php_spl.c
+++ b/ext/spl/php_spl.c
diff --cc ext/spl/php_spl.h
index 855a78c,fb0765a..855a78c
mode 100755,100644..100644
--- a/ext/spl/php_spl.h
+++ b/ext/spl/php_spl.h
diff --cc ext/spl/spl_array.c
index 3c6b41e,11540de..3c6b41e
mode 100755,100644..100644
--- a/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c
diff --cc ext/spl/spl_directory.c
index b86e686,8c1810e..b86e686
mode 100755,100644..100644
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
diff --cc ext/spl/spl_functions.c
index b9fd5dc,3a3cdcc..b9fd5dc
mode 100755,100644..100644
--- a/ext/spl/spl_functions.c
+++ b/ext/spl/spl_functions.c
diff --cc ext/spl/spl_functions.h
index 394de6a,8cf98e5..394de6a
mode 100755,100644..100644
--- a/ext/spl/spl_functions.h
+++ b/ext/spl/spl_functions.h
diff --cc ext/spl/spl_iterators.c
index 098d7dc,a46b7d4..098d7dc
mode 100755,100644..100644
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
diff --cc ext/spl/spl_iterators.h
index 4a2c999,525a25c..4a2c999
mode 100755,100644..100644
--- a/ext/spl/spl_iterators.h
+++ b/ext/spl/spl_iterators.h
diff --cc ext/spl/spl_observer.c
index 4b8be82,85bbeec..4b8be82
mode 100755,100644..100644
--- a/ext/spl/spl_observer.c
+++ b/ext/spl/spl_observer.c
diff --cc ext/standard/winver.h
index 7152d60,cb469a9..7152d60
mode 100755,100644..100644
--- a/ext/standard/winver.h
+++ b/ext/standard/winver.h
diff --cc main/php_streams.h
index 82498d6,83b18c0..82498d6
mode 100755,100644..100644
--- a/main/php_streams.h
+++ b/main/php_streams.h
diff --cc main/streams/glob_wrapper.c
index 7b56850,4a35153..7b56850
mode 100755,100644..100644
--- a/main/streams/glob_wrapper.c
+++ b/main/streams/glob_wrapper.c
diff --cc main/streams/streams.c
index e9c2e07,dfd6094..e9c2e07
mode 100755,100644..100644
--- a/main/streams/streams.c
+++ b/main/streams/streams.c


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

Reply via email to