clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-28 21:36:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
103,584 Commits 494 Branches 1,367 Tags 785 MiB
b8da481a2a
Commit Graph

103584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sara Golemon
c7aa8ba0ee
Bugfix #74993 Wrong reflection param into for some intl: lookup_*() methods 2017-07-26 18:55:23 -04:00
Anatol Belski
57c435e5ac [ci skip] update NEWS 2017-07-26 17:31:57 +02:00
Anatol Belski
2d8fe973b1 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  [ci skip] update NEWS
  [ci skip] update NEWS
 2017-07-26 17:31:10 +02:00
Anatol Belski
4cde48bb73 [ci skip] update NEWS 2017-07-26 17:30:40 +02:00
Anatol Belski
3f9e8e6686 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  [ci skip] update NEWS
 2017-07-26 17:30:02 +02:00
Anatol Belski
3306b3aa60 [ci skip] update NEWS 2017-07-26 17:29:37 +02: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
787ea0dda5 Update NEWS 2017-07-26 15:25:01 +10:00
Christopher Jones
664eca5967 Merge branch 'PHP-7.1' into PHP-7.2 2017-07-26 15:24:26 +10:00
Christopher Jones
747f5b23ae Update NEWS 2017-07-26 15:23:58 +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
53e59e4b34 Update NEWS 2017-07-26 12:07:20 +08: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
Aleš Rebec
f469edcf59
Remove obsolete function names from CODING_STANDARDS file 
Deprecated and removed function names used as examples in coding standards file.

- Mcrypt is deprecated and will be removed in 7.2
- Mysql functions are deprecated in 5.4 and removed in 7.0.

According to those changes, CODING_STANDARDS file should be updated.
 2017-07-25 07:04:23 +01: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
Anatol Belski
7453d2303b Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  switch to binary sdk 2.0.9 for appveyor
 2017-07-24 23:09:20 +02:00
Anatol Belski
bedd881da6 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  switch to binary sdk 2.0.9 for appveyor
 2017-07-24 23:08:07 +02:00
Anatol Belski
cdf9178c43 switch to binary sdk 2.0.9 for appveyor 2017-07-24 23:07:15 +02:00
jrfnl
f901e7e3c5 Fix typo in PHP 7.2 changelog 2017-07-24 16:57:07 -04: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
Anatol Belski
0489e85c18 [ci skip] update NEWS 2017-07-24 17:46:31 +02:00
Anatol Belski
cb7e42da25 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Add test for bug #74903
 2017-07-24 17:03:24 +02:00
Anatol Belski
2dc81d4a09 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Add test for bug #74903
 2017-07-24 17:02:55 +02:00
Anatol Belski
a769d873f8 Add test for bug #74903 2017-07-24 17:02:10 +02:00
Anatol Belski
660b829ccc Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Followup on 0ec147d3 for another place
  Ensure binary mode for OpenSSL I/O
 2017-07-24 16:38:05 +02:00
Anatol Belski
e2b61eccb9 Followup on 0ec147d3 for another place 
which requires also to move the macros into the header

(cherry picked from commit b7eb2c0604)
 2017-07-24 16:33:12 +02:00
Anatol Belski
6918a68d9d Ensure binary mode for OpenSSL I/O 
Essential for OpenSSL 1.1.0 on Windows, some issues was revealed earlier
and now by openssl_pkcs12_export_to_file_basic.phpt.

(cherry picked from commit 0ec147d301)
 2017-07-24 16:31:09 +02:00
Anatol Belski
b7eb2c0604 Followup on 0ec147d3 for another place 
which requires also to move the macros into the header
 2017-07-24 16:24:04 +02:00
Anatol Belski
0ec147d301 Ensure binary mode for OpenSSL I/O 
Essential for OpenSSL 1.1.0 on Windows, some issues was revealed earlier
and now by openssl_pkcs12_export_to_file_basic.phpt.
 2017-07-24 15:43:48 +02:00
Anatol Belski
8a6afbef3f Combine conditions for the automatic interactive console activation 
as with bug #74979 it seems to have regressions which were not
present before.
 2017-07-24 14:47:32 +02:00
Frank Denis
742895f60c sodium ext: don't reinvent sodium_increment() and sodium_add() 2017-07-24 14:26:05 +02:00
Joe Watkins
52964bbfb2
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  openssl: Add openssl_pkcs12_export_to_file tests
 2017-07-24 10:47:02 +01:00
Joe Watkins
5816ce330c
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  openssl: Add openssl_pkcs12_export_to_file tests
 2017-07-24 10:46:52 +01:00