Commit Graph

75375 Commits

Author SHA1 Message Date
Dmitry Stogov
294335761b Merge branch 'PHP-5.5'
* PHP-5.5:
  Merge from GitHub
  Update NEWS
  Fixed bug #65336

Conflicts:
	NEWS
2013-07-28 13:50:13 +04:00
Dmitry Stogov
ae5e70afac Merge from GitHub 2013-07-28 13:47:13 +04:00
Yasuo Ohgaki
d4aee1021e Fixed bug #65336 2013-07-27 05:55:02 +09:00
Yasuo Ohgaki
bafe0e5399 Update NEWS 2013-07-27 05:54:33 +09:00
Yasuo Ohgaki
ef3d813d2c Fixed bug #65336 2013-07-27 05:54:33 +09:00
Christopher Jones
85b66e9e21 OCI8 extension: Allow Implicit Result Set statement resources to inherit the parent's current prefetch count 2013-07-26 13:34:45 -07:00
Christopher Jones
fc410f6ece Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Fix --enable-maintainer-zts mode in OCI8 2.0
2013-07-26 11:34:21 -07:00
Christopher Jones
586fc4909e Fix --enable-maintainer-zts mode in OCI8 2.0 2013-07-25 16:15:32 -07:00
Christopher Jones
c67714b782 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Update UPGRADING and make typo fixes to OCI8 package.xml
2013-07-25 10:57:53 -07:00
Christopher Jones
8e79724c6f Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
* 'PHP-5.5' of https://git.php.net/repository/php-src:
2013-07-25 10:57:47 -07:00
Christopher Jones
fe98ffc227 Update UPGRADING and make typo fixes to OCI8 package.xml 2013-07-25 10:54:03 -07:00
Christopher Jones
1224e6cccd Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Upper section name
  Update NEWs
  Fixed bug #65328 (Segfault when getting SplStack object Value)
2013-07-25 10:42:47 -07:00
Christopher Jones
4cab45946c Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Upper section name
  Update NEWs
  Fixed bug #65328 (Segfault when getting SplStack object Value)
2013-07-25 10:42:45 -07:00
Christopher Jones
b39f973c63 Merge branch 'master' of https://git.php.net/repository/php-src
# By Johannes Schlüter (3) and others
# Via Johannes Schlüter (4) and others
* 'master' of https://git.php.net/repository/php-src:
  Upper section name
  Update NEWs
  Fixed bug #65328 (Segfault when getting SplStack object Value)
  Initial PHP OCI8 2.0.0-dev commit.
  Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro.
  fix missing include
  Fix bug 65299
  Fix compiler warning on redefined constant
  Fix comment
  fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
  fix bug #65028 	Phar::buildFromDirectory creates corrupt archives for some specific contents
2013-07-25 08:53:33 -07:00
Christopher Jones
42e8f3ca28 Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
# By Johannes Schlüter (3) and others
# Via Xinchen Hui (3) and others
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  Upper section name
  Update NEWs
  Fixed bug #65328 (Segfault when getting SplStack object Value)
  Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro.
  fix missing include
  Fix bug 65299
  Fix compiler warning on redefined constant
  Fix comment
  fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
  fix bug #65028 	Phar::buildFromDirectory creates corrupt archives for some specific contents
2013-07-25 08:53:29 -07:00
Xinchen Hui
c49de17fe5 Merge branch 'PHP-5.5' 2013-07-25 22:46:21 +08:00
Xinchen Hui
9776504c5b Merge branch 'PHP-5.4' into PHP-5.5 2013-07-25 22:45:44 +08:00
Xinchen Hui
515092917d Upper section name 2013-07-25 22:45:15 +08:00
Xinchen Hui
1fbcfc9bdb Update NEWs 2013-07-25 22:44:59 +08:00
Xinchen Hui
9126909c08 Merge branch 'PHP-5.4' into PHP-5.5 2013-07-25 22:44:19 +08:00
Xinchen Hui
9909c4d4c4 Fixed bug #65328 (Segfault when getting SplStack object Value) 2013-07-25 22:43:41 +08:00
Christopher Jones
4a9d0e1579 Merge branch 'oci8_20'
* oci8_20:
  Initial PHP OCI8 2.0.0-dev commit.
2013-07-24 15:36:57 -07:00
Christopher Jones
bfc3c223da Initial PHP OCI8 2.0.0-dev commit.
Includes Oracle Database 12c Implicit Result Set support, DTrace
support, and various code cleanups.

See package.xml for details.
2013-07-24 15:33:22 -07:00
Stanislav Malyshev
86064e0701 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix bug #65028 	Phar::buildFromDirectory creates corrupt archives for some specific contents
2013-07-23 21:46:23 -07:00
Stanislav Malyshev
b8c8a04a85 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix bug #65028 	Phar::buildFromDirectory creates corrupt archives for some specific contents
2013-07-23 21:45:35 -07:00
Stanislav Malyshev
96a53f6715 Merge branch 'bug65028' into PHP-5.4
* bug65028:
  fix bug #65028 	Phar::buildFromDirectory creates corrupt archives for some specific contents
2013-07-23 21:44:06 -07:00
Adam Harvey
7fa841c888 Merge branch 'PHP-5.5'
* PHP-5.5:
  Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro.
2013-07-23 11:19:02 -07:00
Adam Harvey
f9000fde98 Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro.
On most platforms, this works fine, but on Linux armhf, strncmp() is a macro
rather than a real function, ergo the macro expansion of ZEND_STRL doesn't
occur until after the compiler knows it needs three parameters for strncmp()
and we get a compile error.

Fixes the fix for bug #61697.
2013-07-23 11:15:43 -07:00
Anatol Belski
678ef6a133 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix missing include
2013-07-23 18:07:16 +02:00
Anatol Belski
f00d796b7e fix missing include 2013-07-23 18:06:51 +02:00
Johannes Schlüter
416e270835 Merge branch 'PHP-5.5' 2013-07-23 14:14:18 +02:00
Johannes Schlüter
7b92a22772 Fix bug 65299 2013-07-23 14:13:22 +02:00
Johannes Schlüter
6b4742582f Merge branch 'PHP-5.5' 2013-07-23 13:15:15 +02:00
Johannes Schlüter
5a8b0ca8fa Merge branch 'PHP-5.4' into PHP-5.5 2013-07-23 12:57:08 +02:00
Johannes Schlüter
c28ab73d73 Fix compiler warning on redefined constant 2013-07-23 12:50:37 +02:00
Johannes Schlüter
004163a914 Merge branch 'PHP-5.5' 2013-07-23 12:42:20 +02:00
Johannes Schlüter
063e10b275 Fix comment 2013-07-23 12:41:24 +02:00
Anatol Belski
94e15ff387 Merge branch 'PHP-5.5'
* PHP-5.5:
  fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
2013-07-23 10:00:24 +02:00
Anatol Belski
8aebe0f1e7 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
2013-07-23 10:00:07 +02:00
Anatol Belski
9b6aa268a3 fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt 2013-07-23 09:59:08 +02:00
Christopher Jones
99f7b72025 Merge branch 'master' of https://git.php.net/repository/php-src
# By Veres Lajos (15) and others
# Via Stanislav Malyshev (31) and others
* 'master' of https://git.php.net/repository/php-src: (99 commits)
  fixed possible null deref
  Disable a flag
  - addressed bug #65159, Misleading configure help text for --with-mysql-sock
  Fix bug #61697 - spl_autoload_functions returns lambda functions incorrectly
  Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
  Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
  Added recursivetreeiterator::setPostfix() method
  next is 5.5.2
  add a few comment
  allow both the old and new cfg argument to work. (the old of course should contain the typo)
  mssql.compatability_mode fix
  backward compatibility
  HASH_KEY_NON_EXISTANT fix
  Update NEWS
  Fixed bug #65304 (Use of max int in array_sum)
  Updaet NEWS
  Reorder NEWS
  intl: remove extra quotes from arginfo params
  updated test script for bug #65045.
  Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
  ...
2013-07-22 10:59:10 -07:00
Christopher Jones
024972e3b9 Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
# By Anatol Belski (12) and others
# Via Stanislav Malyshev (12) and others
* 'PHP-5.5' of https://git.php.net/repository/php-src: (74 commits)
  fixed possible null deref
  - addressed bug #65159, Misleading configure help text for --with-mysql-sock
  Fix bug #61697 - spl_autoload_functions returns lambda functions incorrectly
  Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
  Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
  Added recursivetreeiterator::setPostfix() method
  next is 5.5.2
  add a few comment
  allow both the old and new cfg argument to work. (the old of course should contain the typo)
  mssql.compatability_mode fix
  backward compatibility
  HASH_KEY_NON_EXISTANT fix
  Update NEWS
  Fixed bug #65304 (Use of max int in array_sum)
  Updaet NEWS
  Reorder NEWS
  intl: remove extra quotes from arginfo params
  Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
  Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
  Properly fixed bug #63186 on NetBSD == 6.0
  ...
2013-07-22 10:59:01 -07:00
Anatol Belski
b966a0bf46 Merge branch 'PHP-5.5'
* PHP-5.5:
  fixed possible null deref
2013-07-22 14:51:27 +02:00
Anatol Belski
bd20c79423 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fixed possible null deref
2013-07-22 14:51:11 +02:00
Anatol Belski
25f924abf6 fixed possible null deref 2013-07-22 14:50:18 +02:00
Andrey Hristov
a48e2bad62 Merge branch 'master' of ssh://git.php.net/php-src 2013-07-22 11:03:10 +02:00
Andrey Hristov
a047ece2e0 Disable a flag 2013-07-22 11:02:48 +02:00
Stanislav Malyshev
f8efdc2b4b fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents 2013-07-22 00:57:33 -07:00
Stanislav Malyshev
4467ada680 Merge branch 'pull-request/326'
* pull-request/326:
  zend_register_null_constant fixed zend_register_bool_constant usage in macros use REGISTER_MAIN_* in zend_register_standard_constants
  zend_API.h included ZVAL_* family in use
  use Z_* family macros
  zend_register_bool_constant patch
2013-07-21 23:19:33 -07:00
Stanislav Malyshev
8d2651d8fc Merge branch 'PHP-5.5'
* PHP-5.5:
  - addressed bug #65159, Misleading configure help text for --with-mysql-sock
2013-07-21 23:15:03 -07:00