php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-03 22:22:18 +02:00
Code Issues Packages Projects Releases Wiki Activity
72,855 Commits 547 Branches 1,481 Tags
ce005c0883f64c97cd83bdd8a80db3bed7cfcb50
Commit Graph

72855 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stanislav Malyshev
ce005c0883 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  update NEWS
  mb_split() can now handle empty matches like preg_split() does.
 2013-02-09 23:05:35 -08:00
Stanislav Malyshev
bfdb889d4f update NEWS 2013-02-09 23:02:26 -08:00
Moriyoshi Koizumi
20eb33b321 mb_split() can now handle empty matches like preg_split() does. 2013-02-10 15:05:17 +09:00
Moriyoshi Koizumi
0ea83ff847 mb_split() can now handle empty matches like preg_split() does. 2013-02-10 15:04:23 +09:00
Andrey Hristov
3d9a31efdf news for mysqli_savepoint and mysql_release_savepoint 2013-02-08 18:33:45 +01:00
Andrey Hristov
a5b426eeff update test case 2013-02-08 18:28:22 +01:00
Andrey Hristov
43ecd8fe1b mysqli_savepoint()/mysqli_release_savepoint() 2013-02-08 18:09:50 +01:00
Andrey Hristov
0da369ae50 Add the constants needed for mysqli_commit(), _rollback() and 
begin_transaction()
 2013-02-08 17:05:25 +01:00
Andrey Hristov
666a835660 Add savepoint and rollback to savepoint support 2013-02-08 16:36:17 +01:00
Andrey Hristov
2d30a192f0 add the news about recent commits 2013-02-08 11:12:54 +01:00
Andrey Hristov
e1e22fd2e4 Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5 2013-02-07 20:35:30 +01:00
Andrey Hristov
afacdecd1f Add support for begin_transaction in libmysql mode. 
Add support for flags and name for commit/rollback in libmysql mode
 2013-02-07 18:45:49 +01:00
Boris Lytochkin
92a7924c1a Merge branch 'PHP-5.4' of https://git.php.net/push/php-src into PHP-5.4 2013-02-07 21:43:37 +04:00
Boris Lytochkin
e09211545c Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5 2013-02-07 21:42:07 +04:00
Andrey Hristov
403d4fbbff Export new calls 2013-02-07 18:29:19 +01:00
Xinchen Hui
7948eea6f9 Forgot test script 2013-02-07 23:49:35 +08:00
Xinchen Hui
ee825e0b42 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-02-07 23:45:28 +08:00
Xinchen Hui
290509755a Fixed bug #64135 (Exceptions from set_error_handler are not always propagated) 2013-02-07 23:44:46 +08:00
Andrey Hristov
49e3d91ad9 Add the name in a comment at commit/rollback, if provided 2013-02-07 16:24:08 +01:00
Andrey Hristov
9fb0dba4be Add support for commit and rollback options. 
Add support for explicitly starting a transaction - modes also available.
Using the API makes the life of load balancer mysqlnd plugins easier/possible.
 2013-02-07 16:05:27 +01:00
Dmitry Stogov
0547a36e95 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Disabled external entities loading
 2013-02-07 16:09:49 +04:00
Dmitry Stogov
1a18e84822 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Disabled external entities loading
 2013-02-07 16:09:12 +04:00
Dmitry Stogov
afe98b7829 Disabled external entities loading 2013-02-07 16:07:05 +04:00
Boris Lytochkin
6c5c04888d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix bug #64124 (IPv6 malformed)
 2013-02-07 14:49:45 +04:00
Boris Lytochkin
ed6763420c fix bug #64124 (IPv6 malformed) 
hostname returned from zend_parse_parameters() was modified in
netsnmp_session_init() that caused imput parameter modification along with
unpredictable changes when parameter is a constant sctring.

One typo in comment was fixed.
 2013-02-07 14:48:28 +04:00
Dmitry Stogov
4730bc8680 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Check if soap.wsdl_cache_dir confirms to open_basedir
 2013-02-07 13:12:01 +04:00
Dmitry Stogov
702b436ef4 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Check if soap.wsdl_cache_dir confirms to open_basedir
 2013-02-07 13:10:04 +04:00
Dmitry Stogov
cc4c318b0c Check if soap.wsdl_cache_dir confirms to open_basedir 2013-02-07 13:04:47 +04:00
Anatoliy Belsky
215da6057f make libvpx optional 2013-02-06 16:22:27 +01:00
Remi Collet
02ae4522f5 revert 2013-02-05 12:29:21 +01:00
Remi Collet
7b75a941ef Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  revert
 2013-02-05 12:29:01 +01:00
Remi Collet
e7ce002c01 revert 2013-02-05 12:28:47 +01:00
Remi Collet
6585a7bd79 NEWS 2013-02-04 15:27:43 +01:00
Remi Collet
79956330fe Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #64142 (dval to lval different behavior on ppc64)
 2013-02-04 15:27:07 +01:00
Remi Collet
6533094d9e Fixed bug #64142 (dval to lval different behavior on ppc64) 
On x86_64:
(long)(double)9223372036854775807+1 = -9223372036854775808
On ppc64
(long)(double)9223372036854775807-1 = 9223372036854775807
 2013-02-04 15:19:32 +01:00
Andrey Hristov
c311884e5b Merge branch 'PHP-5.4' into PHP-5.5 2013-02-04 14:28:23 +01:00
Andrey Hristov
740b823be8 check the validity of the parameter 2013-02-04 14:27:56 +01:00
Andrey Hristov
643ce95b5b Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4 2013-02-04 14:15:58 +01:00
Andrey Hristov
cb8b2dd2e0 Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5 2013-02-04 14:15:29 +01:00
Xinchen Hui
53159f6e05 implicit declaration of zend_throw_exception 2013-02-04 14:20:50 +08:00
Felipe Pena
7369a68379 - Fixed ZTS build 2013-02-03 10:57:31 -02:00
Martin Jansen
60b5f6d463 News about FR #49180. 2013-02-03 13:27:36 +01:00
Martin Jansen
6186b67600 Add option to specific the expected separator character. 2013-02-03 13:23:54 +01:00
Martin Jansen
0661d03eba There is no need to use memchr() for comparisons in these places. 2013-02-03 13:23:53 +01:00
Martin Jansen
2f33443883 ext/filter support for validating MAC addresses. 2013-02-03 13:23:53 +01:00
Gustavo Lopes
8771c265a4 Fix test on Windows. 
Windows complains of invalid parameters because the socket is not bound.
The test expected the error to be EAGAIN/EWOULDBLOCK. Moved the call down,
after the socket is bound.
 2013-02-03 02:03:00 +01:00
Gustavo Lopes
a000920dfb NEWS/UPGRADING for changes in sockets, intl 2013-02-03 01:59:35 +01:00
Gustavo Lopes
af1b90d62b Fix bug and hopefully build on WinSDK 6.1 
There build was failing on rmtools on the sockets extension for two reasons:

  1. IPV6_TCLASS and IPV6_RECVTCLASS not being defined. These are probably
  recent additions to SDK. Windows 7 doesn't event seem to have complete
  support for IPV6_TCLASS, not accepting in WSASendMsg(). The parts that
  needed this constant were not guarded by #ifdefs. They are now.

  2. The constants EWOULDBLOCK and EINPROGRESS not being defined. These
  were only defined in php_network.h, outside of the extension, and not
  all source files included this header. Nevertheless, a macro defined in
  php_sockets.h needed these constants. When this macro was used in files
  that did not include php_network.h, the compilation would fail.
  Surprisingly, the build did not fail when using the 7.1 Windows SDK
  (more likely, the CRT headers used in VC10), as somehow errno.h was
  being included through some other standard header. This would make the
  constant EWOULDBLOCK defined; however, it would be defined to the wrong
  value. In the winsock context, WSAEWOULDBLOCK should be used instead.
  Because we have difficulty using Windows-only constants in the code, we
  (re)define EWOULDBLOCK to WSAEWOULDBLOCK. This has the obvious
  disavantage we may miss problems like this again in the future.
 2013-02-03 01:36:14 +01:00
Gustavo Lopes
6ba5d0a4a5 Merge branch 'PHP-5.4' into PHP-5.5 (strategy ours) 
* PHP-5.4:
  Move macro back to .c file
 2013-02-02 18:40:05 +01:00
Gustavo Lopes
03b1da5d7a php_strerror in ext/sockets renamed in 5.5 2013-02-02 18:39:47 +01:00