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

45959 Commits

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
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
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
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
Frank Denis
f8ffc9622b sodium ext: delete copypasta from sodium_crypto_kdf_derive_from_key() 
/via @fredemmott
 2017-07-21 18:25:25 +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
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
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
3a7b0027f3 Fixed bug #74950 (nullpointer deref in simplexml_element_getDocNamespaces) 2017-07-21 18:16:11 +08:00
Frank Denis
a6b529c399 sodium ext: use crypto_scalarmult_BYTES for points coordinates 
Just for consistency.
 2017-07-20 22:30:58 +02:00
Dmitry Stogov
36259e2593 Merge branch 'PHP-7.2' 
* PHP-7.2:
  fixed comments
  Fixed wrong edges_count re-calculation.
 2017-07-20 23:29:44 +03:00
Dmitry Stogov
0b2c456312 fixed comments 2017-07-20 23:29:22 +03:00
Dmitry Stogov
1b9d0c8af3 Fixed wrong edges_count re-calculation. 2017-07-20 23:28:05 +03:00
Nikita Popov
a319063aae Only write single terminating byte 
As far as I could determine this is sufficient. It avoids
reallocating the buffer, if it was perfectly allocated beforehand.
 2017-07-20 21:41:52 +02:00
Nikita Popov
1388751f10 Use fast zpp in mb_strlen() 
For short strings this function is now sufficiently fast for zpp
to be a bottleneck.
 2017-07-20 21:41:52 +02:00
Nikita Popov
b3c1d9d111 Directly use encodings instead of no_encoding in libmbfl 
In particular strings now store encoding rather than the
no_encoding.

I've also pruned out libmbfl APIs that existed in two forms, one
using no_encoding and the other using encoding. We were not actually
using any of the former.
 2017-07-20 21:41:52 +02:00
Frank Denis
2c4010f0fe sodium ext: clear the hash state after we're done hashing 2017-07-20 20:17:52 +02:00
Nikita Popov
22a5f554a8 Temporary fix for windows build 
This API should be changed to stop using negative offsets. For now
I'm replacing ssize_t with long.
 2017-07-20 18:29:44 +02:00
Nikita Popov
77cb7bd837 Free last_used_encoding_name in RSHUTDOWN 
efree() cannot be used in GSHUTDOWN
 2017-07-20 18:12:04 +02:00
Côme Chilliet
5e56d050e5 Added ldap_exop_refresh helper for EXOP REFRESH operation on dds overlay 
ldap_exop_refresh(resource link, string dn, int ttl)
Returns FALSE on failure, newttl on success
 2017-07-20 16:16:59 +02:00
Nikita Popov
c098304e17 Reduce number of encoding conversions in case conversion 
Don't indirect through UCS4BE, instead directly work on wchars
using a custom filter.

This replaces the pipeline
  utf8 -> wchar -> ucs4be -> wchar -case-> wchar -> ucs4be -> wchar -> utf8
with
  utf8 -> wchar -case-> -> wchar -> utf8
 2017-07-20 15:33:24 +02:00
Nikita Popov
17da862b51 Optimize php_unicode_tolower/upper for ASCII 2017-07-20 13:58:40 +02:00
Nikita Popov
ba383b8239 Add basic mbstring encoding cache 
Store the last used encoding and compare against it. It's quite
likely that an application is going to be using the same encoding
again and again.

The actual mbfl_name2encoding() function could also be optimized
to use a hash lookup rather than a linear scan, but we don't have
a hashtable implmentation in libmbfl...
 2017-07-20 13:58:40 +02:00
Nikita Popov
264387e31e Add php_mb_get_no_encoding() helper function 2017-07-20 13:58:40 +02:00
Nikita Popov
adaea77593 Switch libmbfl to use size_t 
Switch mbfl_string and related structures to use size_t lengths.

Quite likely that I broke some things along the way...
 2017-07-20 13:58:40 +02:00
Nikita Popov
79c26d597f Optimize php_unicode_is_lower/upper for ASCII 2017-07-20 13:58:40 +02:00
Côme Chilliet
a3b42ea96b Using LDAP_CONTROL_MANAGEDSAIT constant in ldap tests instead of string oid 2017-07-20 12:37:44 +02:00
Joe Watkins
4fa70b0beb Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug #74941 - Session fails to start after having headers sent
 2017-07-20 07:54:38 +01:00
Sergei Morozov
9b9184a45a Fixed bug #74941 - Session fails to start after having headers sent 2017-07-20 07:52:02 +01:00