php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-17 13:01:02 +02:00
Code Issues Packages Projects Releases Wiki Activity
103,528 Commits 547 Branches 1,483 Tags
e0825ec60fc4e4aa3f026c832c26be51b23b4f09
Commit Graph

103528 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
e0825ec60f Mitigation for ssize_t issue in 22a5f554a8 
and some more
 2017-07-22 22:34:16 +02:00
Frank Denis
934cfa35f8 Merge branch 'PHP-7.2' 
* PHP-7.2:
  sodium ext: require libsodium >= 1.0.8
  sodium ext: define crypto_aead_chacha20poly1305_ietf_KEYBYTES if needed
  sodium ext: remove redundant and obsolete macros
 2017-07-22 22:09:21 +02:00
Frank Denis
401188cbf9 sodium ext: require libsodium >= 1.0.8 
(but really, 1.0.9 should be the bare minimum)
 2017-07-22 22:07:53 +02:00
Frank Denis
c499bd12f7 sodium ext: define crypto_aead_chacha20poly1305_ietf_KEYBYTES if needed 
Some old libsodium versions didn't had a dedicated constant for the
IETF version of this construction.
 2017-07-22 19:57:44 +02:00
Frank Denis
c908caf6df sodium ext: remove redundant and obsolete macros 2017-07-22 17:52:11 +02:00
Frank Denis
8a2e747a7b sodium ext: remove redundant and obsolete macros 2017-07-22 17:50:22 +02:00
Nikita Popov
c264c24805 Merge branch 'PHP-7.2' 2017-07-22 17:24:49 +02:00
Nikita Popov
4672411ef5 Fix incorrect propagation of ZEND_BOOL in pass 1 
BOOL (next to QM_ASSIGN) is one of the opcodes that can assign to
a temporary that is assigned in multiple branches. Pass 1 does
not check for this, so we should not try to handle it at that
point. Block pass and sccp will be able to treat this correctly.
 2017-07-22 17:23:50 +02:00
Nikita Popov
6e2d5208f4 Merge branch 'PHP-7.2' 2017-07-22 14:54:47 +02:00
Nikita Popov
96665fbfe0 Fix block removal if there are duplicate successors 2017-07-22 14:53:23 +02:00
Anatol Belski
886cf66f1e Merge branch 'PHP-7.2' 
* PHP-7.2:
  [ci skip] update NEWS
  [ci skip] update NEWS
  [ci skip] update NEWS
 2017-07-22 14:15:53 +02:00
Anatol Belski
1e9ad4a307 [ci skip] update NEWS 2017-07-22 14:15:32 +02:00
Anatol Belski
3fc52f1dc4 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  [ci skip] update NEWS
  [ci skip] update NEWS
 2017-07-22 14:14:22 +02:00
Anatol Belski
c068818ff3 [ci skip] update NEWS 2017-07-22 14:13:51 +02:00
Anatol Belski
e0c0007bd2 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  [ci skip] update NEWS
 2017-07-22 14:13:25 +02:00
Anatol Belski
ad12da4908 [ci skip] update NEWS 2017-07-22 14:12:45 +02:00
Bob Weinand
d7c8688b35 Merge branch 'PHP-7.2' 2017-07-22 11:17:05 +02:00
Bob Weinand
76ce874422 Merge branch 'PHP-7.1' into PHP-7.2 2017-07-22 11:16:48 +02:00
Bob Weinand
134e713be2 Merge branch 'PHP-7.0' into PHP-7.1 2017-07-22 11:14:54 +02:00
Bob Weinand
bad5d0d6c5 Fixed bug #74954 (null deref and segfault in zend_generator_resume()) 2017-07-22 11:14:00 +02:00
Anatol Belski
1513bc32d5 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug #74968 PHP crashes when calling mysqli_result::fetch_object with an abstract class
 2017-07-22 10:37:11 +02:00
Anatol Belski
14e8f9557b Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #74968 PHP crashes when calling mysqli_result::fetch_object with an abstract class
 2017-07-22 10:36:58 +02:00
Anatol Belski
4cb1151fff Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74968 PHP crashes when calling mysqli_result::fetch_object with an abstract class
 2017-07-22 10:36:31 +02:00
Anatol Belski
e405ff59f9 Fixed bug #74968 PHP crashes when calling mysqli_result::fetch_object with an abstract class 2017-07-22 10:35:26 +02:00
Nikita Popov
75969eee77 Merge branch 'PHP-7.2' 2017-07-21 23:23:55 +02:00
Nikita Popov
3fa76ac54f Merge branch 'PHP-7.1' into PHP-7.2 2017-07-21 23:22:56 +02:00
Nikita Popov
69ec51eb02 Fix DFG construction for VERIFY_RETURN 
`use` only contains uses prior to definition. This was not
honoured for VERIFY_RETURN with a temporary operand.

The test case only breaks on PHP 7.2.
 2017-07-21 23:20:56 +02:00
Kalle Sommer Nielsen
2d15d8792c Merge branch 'master' of git.php.net:/php-src 2017-07-21 22:43:44 +02:00
Kalle Sommer Nielsen
73cc299159 win32/install.txt is no more, just copy INSTALL instead 2017-07-21 22:43:25 +02:00
Anatol Belski
7a8c047c23 Merge branch 'PHP-7.2' 
* PHP-7.2:
  remove casts and ensure no out of bounds access
  sodium ext: delete copypasta from sodium_crypto_kdf_derive_from_key()
 2017-07-21 22:27:34 +02:00
Anatol Belski
7ec8b8d49f remove casts and ensure no out of bounds access 2017-07-21 22:26:37 +02:00
Kalle Sommer Nielsen
07e8bdd8c2 Free the HMODULE handle after use 2017-07-21 22:24:14 +02:00
Kalle Sommer Nielsen
d86a333a43 Free the HMODULE handle after use 2017-07-21 22:22:41 +02:00
Kalle Sommer Nielsen
fd29202022 Free the HMODULE handle after use 2017-07-21 22:21:25 +02:00
Kalle Sommer Nielsen
b613392003 Test case for bug #64739 2017-07-21 21:55:11 +02:00
Kalle Sommer Nielsen
1e9e7d4dc4 Point to the online documentation for installation of PHP in INSTALL, and remove the almost duplicate win32/install.txt, one place for all docs should be enough 2017-07-21 18:42:57 +02:00
Kalle Sommer Nielsen
a2f22b1d2a Don't bail configure on Windows if a configure argument was not found, this mimics that of the Unix build system. 
configure --hello-world will now yield the following in the bottom of the configure summary:

WARNING
The following arguments is invalid, and therefore ignored:
 --hello-world
 2017-07-21 18:33:42 +02:00
Frank Denis
f8ffc9622b sodium ext: delete copypasta from sodium_crypto_kdf_derive_from_key() 
/via @fredemmott
 2017-07-21 18:25:25 +02:00
Anatol Belski
8ecb5fbb6b Merge branch 'PHP-7.2' 
* PHP-7.2:
  sodium ext: use crypto_scalarmult_BYTES for points coordinates
  sodium ext: clear the hash state after we're done hashing
  sodium ext: drop unused code /via @remicollet
 2017-07-21 16:13:52 +02:00
Frank Denis
0e2a7fc829 sodium ext: use crypto_scalarmult_BYTES for points coordinates 
Just for consistency.
 2017-07-21 14:02:33 +02:00
Frank Denis
557029e8e6 sodium ext: clear the hash state after we're done hashing 2017-07-21 14:02:26 +02:00
Frank Denis
d8a14e2aad sodium ext: drop unused code 
/via @remicollet
 2017-07-21 14:02:18 +02:00
Xinchen Hui
61dbb6cd49 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Update NEWS
  Update NEWS
  Fixed bug #74950 (nullpointer deref in simplexml_element_getDocNamespaces)
 2017-07-21 18:18:09 +08:00
Xinchen Hui
735b34c016 Update NEWS 2017-07-21 18:17:54 +08:00
Xinchen Hui
01090e6ced Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Update NEWS
  Fixed bug #74950 (nullpointer deref in simplexml_element_getDocNamespaces)
 2017-07-21 18:17:33 +08:00
Xinchen Hui
a8f98fc7f7 Update NEWS 2017-07-21 18:17:12 +08:00
Xinchen Hui
08177312fb Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74950 (nullpointer deref in simplexml_element_getDocNamespaces)
 2017-07-21 18:16:54 +08:00
Xinchen Hui
256ec5bebb Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 
* 'PHP-7.0' of git.php.net:/php-src:
  Move the define into the header to reduce diff for future upgrade
 2017-07-21 18:16:37 +08:00
Xinchen Hui
3a7b0027f3 Fixed bug #74950 (nullpointer deref in simplexml_element_getDocNamespaces) 2017-07-21 18:16:11 +08:00
Anatol Belski
489b023326 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Move the define into the header to reduce diff for future upgrade
 2017-07-21 11:17:01 +02:00