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,565 Commits 547 Branches 1,483 Tags
650f68c36e8d1da2b29a52afff398fc1f467a4e7
Commit Graph

45986 Commits

Author SHA1 Message Date
Frank Denis
650f68c36e sodium ext: fix tests/pwhash_argon2i description 2017-07-30 15:05:21 +02:00
Frank Denis
74d7f1d04e sodium ext: check hash length for scrypt 2017-07-30 15:00:03 +02:00
Frank Denis
3f45262aa9 Merge branch 'PHP-7.2' of git.php.net:php-src into PHP-7.2 
* 'PHP-7.2' of git.php.net:php-src:
  It's `--SKIPIF--`, not `--SKIP--`
 2017-07-30 14:48:44 +02:00
Frank Denis
85895b2e5b sodium ext: no need for #ifdef crypto_aead_chacha20poly1305_IETF_NPUBBYTES 
chacha20poly1305_ietf was implemented in libsodium 1.0.4 which is way earlier
than the minimum version we support.
 2017-07-30 14:47:49 +02:00
Frank Denis
1d7e1f845f sodium ext: check that message sizes are safe, to avoid hitting abort() in libsodium 2017-07-30 14:45:06 +02:00
Frank Denis
ae99959986 sodium ext: use unexpand -t 4 --first-only to convert from spaces to tabs 
No actual code changes.

Fun fact: macOS' unexpand(1) tool doesn't work as documented, and always
converts everything to tabs, regardless of the -a switch.
 2017-07-30 14:34:55 +02:00
Christoph M. Becker
782f45c8e6 It's --SKIPIF--, not --SKIP-- 2017-07-30 14:01:51 +02:00
Christoph M. Becker
71e47c5c13 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Skip this test if ext/gd is not available
 2017-07-30 13:37:36 +02:00
Christoph M. Becker
f213ee5952 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Skip this test if ext/gd is not available
 2017-07-30 13:30:18 +02:00
Christoph M. Becker
4d6f808c16 Skip this test if ext/gd is not available 2017-07-30 13:24:10 +02:00
Frank Denis
613c8dd7b0 sodium ext: let crypto_pwhash() accept an optional algorithm identifier 2017-07-29 13:04:54 +02:00
Nikita Popov
5d777e56e2 Merge branch 'PHP-7.1' into PHP-7.2 2017-07-28 13:03:26 +02:00
Nikita Popov
c48c638aeb Merge branch 'PHP-7.0' into PHP-7.1 2017-07-28 13:03:02 +02:00
Nikita Popov
e3d25e78eb Fixed bug #62934 2017-07-28 13:02:25 +02:00
Anatol Belski
80d839d25a add missing makefile fragment for .w32 
ensure correct dir
 2017-07-28 07:26:11 +02:00
Anatol Belski
2ae0dd7f61 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  relax test on travis
 2017-07-28 00:28:12 +02:00
Anatol Belski
55e7459cea Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  relax test on travis
 2017-07-28 00:27:52 +02:00
Anatol Belski
b01336814d relax test on travis 2017-07-28 00:27:11 +02:00
Xinchen Hui
262aeb8ae1 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed test
 2017-07-27 12:50:41 +08:00
Xinchen Hui
0ddda0dcb7 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed test
 2017-07-27 12:50:28 +08:00
Xinchen Hui
9fcfe52d03 Fixed test 2017-07-27 12:50:17 +08:00
Xinchen Hui
afc2be8fc8 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Update NEWS
  Fixed bug #74949 (null pointer dereference in _function_string)
 2017-07-27 11:24:53 +08:00
Xinchen Hui
84a18c4782 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74949 (null pointer dereference in _function_string)
 2017-07-27 11:23:27 +08:00
Xinchen Hui
e36c04ef48 Fixed bug #74949 (null pointer dereference in _function_string) 2017-07-27 11:23:06 +08:00
Sara Golemon
08fef4cc23 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Bugfix #74993 Wrong reflection param into for some intl: lookup_*() methods
 2017-07-26 18:56:06 -04:00
Sara Golemon
80f4297c25 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Bugfix #74993 Wrong reflection param into for some intl: lookup_*() methods
 2017-07-26 18:55:46 -04:00
Sara Golemon
c7aa8ba0ee Bugfix #74993 Wrong reflection param into for some intl: lookup_*() methods 2017-07-26 18:55:23 -04:00
Anatol Belski
9ff4801159 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #74833, SID constant created with wrong module number
 2017-07-26 13:21:20 +02:00
Anatol Belski
eaf5c7cdd4 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74833, SID constant created with wrong module number
 2017-07-26 13:20:48 +02:00
Anatol Belski
bd00fe81cc Fixed bug #74833, SID constant created with wrong module number 2017-07-26 13:19:41 +02:00
Joe Watkins
d3060a00d1 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #74991 - include_path has a 4096 char (minus "__DIR__:") limit, in some PHAR cases
 2017-07-26 10:47:49 +01:00
Joe Watkins
bb9ea4e88b Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #74991 - include_path has a 4096 char (minus "__DIR__:") limit, in some PHAR cases
 2017-07-26 10:47:22 +01:00
Benjamin W. Broersma
6b1fbafdf0 Fix bug #74991 - include_path has a 4096 char (minus "__DIR__:") limit, in some PHAR cases 2017-07-26 10:46:50 +01:00
Christopher Jones
664eca5967 Merge branch 'PHP-7.1' into PHP-7.2 2017-07-26 15:24:26 +10:00
Christopher Jones
46a6ae0d45 Merge branch 'PHP-7.0' into PHP-7.1 2017-07-26 15:23:17 +10:00
Christopher Jones
de65a2243f Expose oci_unregister_taf_callback() 2017-07-26 15:22:44 +10:00
Xinchen Hui
0e61cddeb1 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #74980 (Narrowing occurred during type inference)
 2017-07-26 12:06:55 +08:00
Xinchen Hui
3df47c12f7 Fixed bug #74980 (Narrowing occurred during type inference) 2017-07-26 12:06:33 +08:00
Joe Watkins
4ddb0630c2 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed finding CURL on systems with multiarch support
 2017-07-25 06:59:03 +01:00
Joe Watkins
238f837cbc Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed finding CURL on systems with multiarch support
 2017-07-25 06:58:37 +01:00
Carsten Brandt
3fd7d819b8 Fixed finding CURL on systems with multiarch support 
fixes https://bugs.php.net/bug.php?id=74125

This commit makes the cURL config script aware of debian/ubuntu
[multiarch support][1] which installs architecture specific
headers in a different location.

It checks whether the `dpkg-architecture` script exists and is
executeable, if that is the case, the multiarch architecture is
detected by calling `dpkg-architecture -qDEB_HOST_MULTIARCH` as
documented in [debian multiarch implementation docs][2]:

> `/usr/include/<triplet>`: used for arch-varying headers

[1]: https://wiki.debian.org/Multiarch
[2]: https://wiki.debian.org/Multiarch/Implementation
 2017-07-25 06:58:11 +01:00
Joe Watkins
8d5a5fbf6b Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  minor loop optimizations, closes #2633
 2017-07-25 06:54:20 +01:00
Joe Watkins
78ad5e8864 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  minor loop optimizations, closes #2633
 2017-07-25 06:51:44 +01:00
Joe Watkins
69b48f83df minor loop optimizations, closes #2633 2017-07-25 06:47:58 +01:00
Joe Watkins
2e8759428b Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed #74977 - Appending AppendIterator leads to segfault
 2017-07-25 06:40:25 +01:00
andrewnester
dbc2ffba82 Fixed #74977 - Appending AppendIterator leads to segfault 2017-07-25 06:39:50 +01:00
Sammy Kaye Powers
66729aeeeb Fix ext/sodium display in phpinfo() 2017-07-25 06:35:40 +01:00
Joe Watkins
515b396889 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Update copyright year to 2017
 2017-07-24 17:24:22 +01:00
Joe Watkins
b44484b912 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Update copyright year to 2017
 2017-07-24 17:24:10 +01:00
Peter Kokot
924ff6164e Update copyright year to 2017 2017-07-24 17:23:57 +01:00