1
0
mirror of https://github.com/php/php-src.git synced 2026-04-04 06:32:49 +02:00
Commit Graph

72880 Commits

Author SHA1 Message Date
Stanislav Malyshev
d420368bc9 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  update NEWS
2013-02-17 02:38:25 -08:00
Stanislav Malyshev
92b1cb3ca0 update NEWS 2013-02-17 02:37:58 -08:00
Stanislav Malyshev
c877fcf6ec Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Added HTTP codes as of RFC 6585
2013-02-17 01:20:14 -08:00
Jonh Wendell
59b016192d Added HTTP codes as of RFC 6585
Added descriptions for the new HTTP codes:

- 428 Precondition Required
- 429 Too Many Requests
- 431 Request Header Fields Too Large
- 511 Network Authentication Required
2013-02-17 01:18:40 -08:00
Xinchen Hui
d3291de51a Merge branch 'PHP-5.4' into PHP-5.5 2013-02-17 11:06:33 +08:00
Xinchen Hui
263accb626 Merge branch 'PHP-5.3' into PHP-5.4 2013-02-17 11:05:34 +08:00
Xinchen Hui
01ae5c3c2f Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS) 2013-02-17 11:04:36 +08:00
Xinchen Hui
69b80a93de Merge branch 'PHP-5.4' into PHP-5.5 2013-02-16 22:29:14 +08:00
Xinchen Hui
375e3c273b Fix test failed after 0ea83ff847 2013-02-16 22:28:28 +08:00
Xinchen Hui
75742d57eb Exceptions triggered by undefined variable should be handled before FATAL error
this is a enhancement of the fix for bug #64135
2013-02-16 22:22:22 +08:00
Boris Lytochkin
cddc9f598b Fixed bug #64124 (IPv6 malformed) 2013-02-14 23:12:53 +04:00
Boris Lytochkin
68fa6a3eb7 +Fixed bug #64124 (IPv6 malformed). (Boris Lytochkin) 2013-02-14 23:08:08 +04:00
Dmitry Stogov
1bde2b4fc9 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Proper bit reset code
2013-02-13 22:07:57 +04:00
Dmitry Stogov
4b900f4831 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Proper bit reset code
2013-02-13 22:07:21 +04:00
Dmitry Stogov
188c196d4d Proper bit reset code 2013-02-13 22:06:37 +04:00
Ard Biesheuvel
65fa9f2c4b Merge branch 'PHP-5.4' into PHP-5.5 2013-02-13 13:50:53 +01:00
Ard Biesheuvel
050aae2860 Fixed bug #64197 (_Offsetof() macro used but not defined on ARM/Clang)
Updated the code to test for __ARMCC_VERSION instead of __arm, as
that is a more reliable indicator of whether the ARMCC compiler is
being used.
2013-02-13 12:22:50 +01:00
Ard Biesheuvel
d1ad926aa4 Update config.sub/config.guess to latest GPLv2 upstream version
This adds the ability to configure/build for/on 64-bit ARMv8,
which uses the host triplet 'aarch64-linux-gnu'.

Source:
  http://git.savannah.gnu.org/gitweb/?p=config.git;h=306afce
2013-02-11 17:53:30 +01:00
Ard Biesheuvel
dbad4fb3ad NEWS update 2013-02-11 15:54:59 +01:00
Ard Biesheuvel
e2453276e9 Low-level ARM optimizations
- added ARM versions of zend_mm_high_bit()/zend_mm_low_bit()
- improved safe_address()
2013-02-11 14:36:58 +01:00
Ard Biesheuvel
aa12cdc361 Improve x86 inline assembler
- added cc annotation to inline asm that clobbers the condition
  flags
- remove hardcoded constants (IS_LONG,IS_DOUBLE)
- remove hardcoded offsets (zval->value, zval->type)
2013-02-11 13:53:27 +01:00
Andrey Hristov
5bfdf4f069 build fixes 2013-02-11 12:07:10 +01:00
Remi Collet
1a954ea616 NEWS 2013-02-11 09:13:52 +01:00
Remi Collet
dc47ec0490 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed bug #64142 (dval to lval different behavior on ppc64)
2013-02-11 09:13:27 +01:00
Remi Collet
e67a2b9e47 Fixed bug #64142 (dval to lval different behavior on ppc64)
See discussion on internals
http://marc.info/?t=136042277700003&r=1&w=2
2013-02-11 09:10:51 +01:00
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