php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 18:53:33 +02:00
Code Issues Packages Projects Releases Wiki Activity
75,397 Commits 549 Branches 1,485 Tags
e2a433fc5da5ff608386ef0e8356e8699d14fba9
Commit Graph

75397 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Stogov e2a433fc5d Merge branch 'PHP-5.5' 
* PHP-5.5:
  Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s)
  added test script for bug65045.
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.

Conflicts:
	NEWS
 2013-07-31 14:24:30 +04:00
Dmitry Stogov d69b3d8f59 Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s) 2013-07-31 14:20:56 +04:00
Dmitry Stogov d9e2dc8084 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
  added test script for bug65045.
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
 2013-07-31 03:24:04 +04:00
Dmitry Stogov a0fece5201 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed php-5.2 support
 2013-07-31 03:23:10 +04:00
Dmitry Stogov f3aca8bc4d Fixed php-5.2 support 2013-07-31 03:22:34 +04:00
Rui Hirokawa f14ed5bce0 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-07-31 08:18:51 +09:00
Rui Hirokawa 7da3315015 added test script for bug65045. 2013-07-31 08:18:39 +09:00
Rui Hirokawa c10d7e1afc MFH: fixed #65045: mb_convert_encoding breaks well-formed character. 2013-07-31 08:17:15 +09:00
Dmitry Stogov 2bd23530d8 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
 2013-07-31 03:04:48 +04:00
Dmitry Stogov fa041cb2f0 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  Remove tabs on blanklines in Makefile sources. This prevents a 'suspicious line' warning when editing & saving Makefile using Emacs.
 2013-07-31 03:04:22 +04:00
Dmitry Stogov 5338bbbf38 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Added support for glob symbols in blacklist entries (?, *, **)

Conflicts:
	NEWS
 2013-07-31 03:04:00 +04:00
Dmitry Stogov 02409669e4 Added support for glob symbols in blacklist entries (?, *, **) 2013-07-31 03:01:19 +04:00
Christopher Jones 3af80d7df3 Merge branch 'master' of https://git.php.net/repository/php-src 
* 'master' of https://git.php.net/repository/php-src:
  Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)
  A minor fix for configure outpu (Tony)
 2013-07-30 13:39:29 -07:00
Christopher Jones 8ca04e51aa 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:
  Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)
  A minor fix for configure outpu (Tony)
 2013-07-30 13:39:20 -07:00
Christopher Jones 6af7526c77 Remove tabs on blanklines in Makefile sources. This prevents a 
'suspicious line' warning when editing & saving Makefile using Emacs.
 2013-07-30 13:36:10 -07:00
Dmitry Stogov 147d5241dc Merge branch 'PHP-5.5' 
* PHP-5.5:
  Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)
 2013-07-30 22:33:46 +04:00
Dmitry Stogov cb17c99511 Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw) 2013-07-30 22:31:37 +04:00
Dmitry Stogov e831041c5a Merge branch 'PHP-5.5' 
* PHP-5.5:
  A minor fix for configure outpu (Tony)
 2013-07-30 22:04:55 +04:00
Dmitry Stogov e2aba1cf9e A minor fix for configure outpu (Tony) 2013-07-30 22:03:21 +04:00
Dmitry Stogov 0aa342e903 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown).

Conflicts:
	NEWS
 2013-07-30 17:36:47 +04:00
Dmitry Stogov 3550f3d0aa Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown). 2013-07-30 17:35:19 +04:00
Anatol Belski 5e1ac558c3 make simplexml headers available to the outta world 2013-07-29 22:18:55 +02:00
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