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

95745 Commits

Author SHA1 Message Date
sskaje
92bcc10e10 comments for e,E,g,G 2016-05-12 19:16:29 +08:00
sskaje
540f4b5cf6 pack()/unpack() for Big Endian float/double and Little Endian float/double 2016-05-12 19:13:21 +08:00
Nikita Popov
0615c59a4f Mark all $php_errormsg as refs to inhibit optimization 2016-04-30 12:34:01 +02:00
Sara Golemon
bdfa6aeebb Merge branch 'PHP-7.0'
* PHP-7.0:
  Create temporary sqlite db in test dir rather than cwd (and clean it up)
2016-04-30 06:05:18 +00:00
Sara Golemon
d0b952260e Create temporary sqlite db in test dir rather than cwd (and clean it up)
Well behaved tests do not leave their droppings all over the filesystem.
2016-04-30 06:02:01 +00:00
Joe Watkins
436b26c70b Merge branch 'master' of https://github.com/php/php-src 2016-04-30 06:49:25 +01:00
Joe Watkins
9ad40d8d36 This function needs to be exported for extensions that implement complex zend objects 2016-04-30 06:48:47 +01:00
Nikita Popov
01df044fd5 Reset IMMUTABLE flag when copy_ctor'ing AST 2016-04-29 22:39:21 +02:00
Nikita Popov
d048837a46 Drop dead code from update_constant 2016-04-29 22:15:38 +02:00
Nikita Popov
5595dd5ffa Revert code to use DUP instead of COPY
In a1c405e0c5 next to the actual fix
I have also switched some (effective) ZVAL_DUPs to ZVAL_COPYs. I'm
reverting this part as those were probably there for a reason
(presumably issues with non-atomic refcounting on ZTS).
2016-04-29 22:02:31 +02:00
Anatol Belski
2c5704bdc2 Merge branch 'PHP-7.0'
* PHP-7.0:
  fix test
  Expose some of the new curl constants to PHP userspace
2016-04-29 14:31:49 +02:00
Anatol Belski
8c74f03c10 fix test 2016-04-29 14:30:19 +02:00
Pierrick Charron
3c92f113e4 Expose some of the new curl constants to PHP userspace 2016-04-29 14:19:55 +02:00
Nikita Popov
a1c405e0c5 Fix usages of zend_update_constant_ex
If an in-place update in an external zval is performed, it needs
to incref'd beforehand, not afterwards.
2016-04-29 14:06:39 +02:00
Joe Watkins
416e22d2bb Merge branch 'master' of https://github.com/php/php-src 2016-04-29 13:05:44 +01:00
Joe Watkins
fdeb8a199e news entry 2016-04-29 13:05:29 +01:00
Dmitry Stogov
dbdc37ac4f Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Implement #51879 stream context socket option tcp_nodelay
2016-04-29 14:45:29 +03:00
Dmitry Stogov
2578d08033 Fixed compilation warnings 2016-04-29 14:44:56 +03:00
Joe Watkins
3aaf90df49 Merge branch 'master' of https://github.com/php/php-src 2016-04-29 12:26:18 +01:00
Joe Watkins
4d92498651 Implement #51879 stream context socket option tcp_nodelay 2016-04-29 12:25:54 +01:00
Joe Watkins
66fc5a3436 Implement #51879 stream context socket option tcp_nodelay 2016-04-29 12:11:58 +01:00
Dmitry Stogov
3e9419dd28 Fixed compilation warnings 2016-04-29 14:03:33 +03:00
Dmitry Stogov
cb75ea4b64 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Add CVE IDs PHP 7.0.0
  Add CVE IDs PHP 7.0.2
  Add CVE IDs PHP 7.0.3
  Add CVE IDs PHP 7.0.4
  Add CVE IDs PHP 7.0.5
  Add CVE to bug #71912 (PHP 7.0.6)
  Add CVE to bug #69719 (PHP 5.6.10)
  Add CVE IDs PHP 5.6.12
  Add CVE IDs PHP 5.6.13
  Add CVE IDs PHP 5.6.14
  Add CVE to bug #70976 (PHP 5.6.17)
  Add CVE IDs PHP 5.6.18
  Add CVE IDs PHP 5.6.20
  Add CVE to bug #71912 (PHP 5.6.21)
2016-04-29 13:44:23 +03:00
Dmitry Stogov
84bf7ae59b Fixed "comparison between signed and unsigned integer expressions" compilation warnings 2016-04-29 13:43:43 +03:00
Lior Kaplan
3d9b4ae69a Merge branch 'PHP-7.0'
* PHP-7.0:
  Add CVE IDs PHP 7.0.0
  Add CVE IDs PHP 7.0.2
  Add CVE IDs PHP 7.0.3
  Add CVE IDs PHP 7.0.4
  Add CVE IDs PHP 7.0.5
  Add CVE to bug #71912 (PHP 7.0.6)
  Add CVE to bug #69719 (PHP 5.6.10)
  Add CVE IDs PHP 5.6.12
  Add CVE IDs PHP 5.6.13
  Add CVE IDs PHP 5.6.14
  Add CVE to bug #70976 (PHP 5.6.17)
  Add CVE IDs PHP 5.6.18
  Add CVE IDs PHP 5.6.20
  Add CVE to bug #71912 (PHP 5.6.21)
2016-04-29 13:42:54 +03:00
Lior Kaplan
9943c32242 Add CVE IDs PHP 7.0.0 2016-04-29 13:41:29 +03:00
Lior Kaplan
5a578eb8f0 Add CVE IDs PHP 7.0.2 2016-04-29 13:40:44 +03:00
Lior Kaplan
8c215baae7 Add CVE IDs PHP 7.0.3 2016-04-29 13:40:07 +03:00
Lior Kaplan
8491a4e438 Add CVE IDs PHP 7.0.4 2016-04-29 13:39:03 +03:00
Lior Kaplan
19b5e950e7 Add CVE IDs PHP 7.0.5 2016-04-29 13:38:25 +03:00
Lior Kaplan
34dec87343 Add CVE to bug #71912 (PHP 7.0.6) 2016-04-29 13:36:24 +03:00
Lior Kaplan
6e68b44843 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Add CVE to bug #69719 (PHP 5.6.10)
  Add CVE IDs PHP 5.6.12
  Add CVE IDs PHP 5.6.13
  Add CVE IDs PHP 5.6.14
  Add CVE to bug #70976 (PHP 5.6.17)
  Add CVE IDs PHP 5.6.18
  Add CVE IDs PHP 5.6.20
  Add CVE to bug #71912 (PHP 5.6.21)
2016-04-29 13:26:46 +03:00
Lior Kaplan
76a5117da7 Add CVE to bug #69719 (PHP 5.6.10) 2016-04-29 13:23:41 +03:00
Lior Kaplan
eeea33db68 Add CVE IDs PHP 5.6.12 2016-04-29 13:21:35 +03:00
Lior Kaplan
26f8ee48d6 Add CVE IDs PHP 5.6.13 2016-04-29 13:19:46 +03:00
Lior Kaplan
91fd5406bc Add CVE IDs PHP 5.6.14 2016-04-29 13:17:34 +03:00
Lior Kaplan
34fc0ec377 Add CVE to bug #70976 (PHP 5.6.17) 2016-04-29 13:16:27 +03:00
Lior Kaplan
a23ae0f436 Add CVE IDs PHP 5.6.18 2016-04-29 13:15:30 +03:00
Dmitry Stogov
0091d81668 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  fix constants availability
  fix size_t signed comparison
2016-04-29 13:13:59 +03:00
Lior Kaplan
b8b2dd1a43 Add CVE IDs PHP 5.6.20 2016-04-29 13:11:54 +03:00
Dmitry Stogov
71842c2828 Fixed breaks of strict-aliasing rules 2016-04-29 13:11:27 +03:00
Lior Kaplan
a91c3f1dd0 Add CVE to bug #71912 (PHP 5.6.21) 2016-04-29 13:10:13 +03:00
Dmitry Stogov
dfe092b22e Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed condition
2016-04-29 12:49:54 +03:00
Dmitry Stogov
70171affd6 Fixed condition 2016-04-29 12:49:41 +03:00
Dmitry Stogov
f2b8b8fde2 Merge branch 'PHP-7.0'
* PHP-7.0:
  Use unsigned shift to clear the bit.
2016-04-29 12:39:27 +03:00
Dmitry Stogov
a8d4649097 Use unsigned shift to clear the bit. 2016-04-29 12:38:48 +03:00
Anatol Belski
9db8cefa3c fix constants availability
The issue here is that winsock2 defines IP protocols as an enum,
so the preprocessor won't catch it. However all the items related
are available as of winxp (see ws2def.h), so it's safe just to have.
2016-04-29 11:37:19 +02:00
Dmitry Stogov
e2340a17bd Merge branch 'PHP-7.0'
* PHP-7.0:
  Simplified condition
2016-04-29 12:34:09 +03:00
Dmitry Stogov
37f7c71f3e Simplified condition 2016-04-29 12:33:54 +03:00
Dmitry Stogov
926857708b Merge branch 'PHP-7.0'
* PHP-7.0:
  size_t is unsigned and can't be negative
2016-04-29 12:24:13 +03:00