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
109,033 Commits 547 Branches 1,483 Tags
a65133a17a8d88f38824fbb0af87ac15bfa4e8a6
Commit Graph

49108 Commits

Author SHA1 Message Date
Scott
e0e08d376e Fix #77297: SodiumException segfaults on PHP 7.3 
Instead of trying to clean the argument arrays from the backtrace, we
overwrite them with empty arrays.
 2018-12-16 16:36:47 +01:00
Anatol Belski
7dc1c7f630 Remove BOM 2018-12-11 00:38:54 +01:00
Nikita Popov
93aabf1533 Fixed bug #77275 
Instead of juggling with this problem during literal compaction,
make sure that we always initialize Z_EXTRA for literals, which
seems like the more robust solution.
 2018-12-10 13:36:23 +01:00
Nikita Popov
59cacdcefd Fix typos in compact literals debugging code 2018-12-10 13:35:55 +01:00
Christopher Jones
6f6a15e1ae Merge branch 'PHP-7.2' into PHP-7.3 2018-12-10 21:54:23 +11:00
Christopher Jones
3aee9ca571 LOL I had 2.10 on my mind 2018-12-10 21:54:13 +11:00
Christopher Jones
95581c6dd9 Merge branch 'PHP-7.2' into PHP-7.3 2018-12-10 10:57:10 +11:00
Christopher Jones
444e400c3b Bundle the new test 2018-12-10 10:45:43 +11:00
Christopher Jones
e47025ffc5 Merge branch 'PHP-7.2' into PHP-7.3 2018-12-10 10:16:27 +11:00
Christopher Jones
e4d894edb3 Improve test portability 2018-12-10 10:16:15 +11:00
Christopher Jones
56e2c0d7db Update for newer Oracle versions 2018-12-10 10:15:53 +11:00
Anatol Belski
6734b1106f Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix syntax error
 2018-12-09 19:15:11 +01:00
Anatol Belski
81207fc607 Fix syntax error 2018-12-09 19:13:09 +01:00
Anatol Belski
be599873f0 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix libtidy exports when ext/tidy compiled static
 2018-12-09 19:01:17 +01:00
Anatol Belski
0d166f76ee Fix libtidy exports when ext/tidy compiled static 2018-12-09 18:59:05 +01:00
Christopher Jones
1f84f2a766 Merge branch 'PHP-7.2' into PHP-7.3 2018-12-09 20:55:21 +11:00
Christopher Jones
99f1f3dedf Add oci_set_call_timeout() and bump version to 2.10.0 2018-12-09 20:55:04 +11:00
Christopher Jones
31eeca8a19 Merge branch 'PHP-7.2' into PHP-7.3 2018-12-09 12:38:53 +11:00
Christopher Jones
e2ecd60f2f Upgrade internal OCI call 2018-12-09 12:38:35 +11:00
Christopher Jones
3da368be2e Merge branch 'PHP-7.2' into PHP-7.3 2018-12-09 12:17:04 +11:00
Christopher Jones
4246702406 Enable Oracle Database DBOP tracing attribute 2018-12-09 12:16:47 +11:00
Christopher Jones
03f6b16de7 Merge branch 'PHP-7.2' into PHP-7.3 2018-12-09 11:30:15 +11:00
Christopher Jones
465c149cd3 Update OCI8 README 2018-12-09 11:28:52 +11:00
Christopher Jones
216d6592e1 Convert some parameter parsing to the Fast Parameter Parsing API 2018-12-09 11:28:04 +11:00
Pierrick Charron
b3a6ca90af Fix 77264: curl_getinfo returning microseconds, not seconds 
Since curl 7.55.0, libcurl introduced new constants to return
more sensible variable types with curl_getinfo.

When curl_getinfo with no option was called, and curl >= 7.55.0, some
of the result were returned as int when they where returned as float
in previous versions. This commit remove this BC Break.

If someone still want to use more sensible variable types, it's always
possible to call curl_getinfo with newer constants.

CURLINFO_CONTENT_LENGTH_DOWNLOAD => CURLINFO_CONTENT_LENGTH_DOWNLOAD_T
CURLINFO_CONTENT_LENGTH_UPLOAD => CURLINFO_CONTENT_LENGTH_UPLOAD_T
CURLINFO_SIZE_DOWNLOAD => CURLINFO_SIZE_DOWNLOAD_T
CURLINFO_SIZE_UPLOAD => CURLINFO_SIZE_UPLOAD_T
CURLINFO_SPEED_DOWNLOAD => CURLINFO_SPEED_DOWNLOAD_T
CURLINFO_SPEED_UPLOAD => CURLINFO_SPEED_UPLOAD_T
CURLINFO_APPCONNECT_TIME => CURLINFO_APPCONNECT_TIME_T
CURLINFO_CONNECT_TIME => CURLINFO_CONNECT_TIME_T
CURLINFO_NAMELOOKUP_TIME => CURLINFO_NAMELOOKUP_TIME_T
CURLINFO_PRETRANSFER_TIME => CURLINFO_PRETRANSFER_TIME_T
CURLINFO_REDIRECT_TIME => CURLINFO_REDIRECT_TIME_T
CURLINFO_STARTTRANSFER_TIME => CURLINFO_STARTTRANSFER_TIME_T
CURLINFO_TOTAL_TIME => CURLINFO_TOTAL_TIME_T
 2018-12-08 15:09:43 -05:00
Christopher Jones
6119d4c670 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Note that PECL install now works on PHP 7.3
  Don't skip with 18c DB
 2018-12-08 20:13:57 +11:00
Christopher Jones
43adf3dc5e Note that PECL install now works on PHP 7.3 2018-12-08 20:13:40 +11:00
Christopher Jones
9a0ec35fa3 Don't skip with 18c DB 2018-12-08 20:12:43 +11:00
Christopher Jones
e355e55e01 Merge branch 'PHP-7.2' into PHP-7.3 2018-12-08 19:24:59 +11:00
Christopher Jones
dd0a8091f4 Fix resource warning value 2018-12-08 19:24:32 +11:00
Christopher Jones
2d53040a6d Bump OCI8 version 2018-12-08 19:23:22 +11:00
Christopher Jones
18b25f0f65 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Update NEWS
 2018-12-08 19:13:12 +11:00
Christopher Jones
8ff6a30598 Update NEWS 2018-12-08 19:12:04 +11:00
Christopher Jones
de9f64f5dd Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  When releasing an oci8 connection always set the resource to null.
 2018-12-08 18:51:13 +11:00
KoenigsKind
3c91851874 When releasing an oci8 connection always set the resource to null. 2018-12-08 18:49:12 +11:00
Christopher Jones
49944e4bcf Merge branch 'PHP-7.2' into PHP-7.3 2018-12-07 23:22:30 +11:00
Nikita Popov
e3946534a4 Drop unnecessary HASH_OF uses in ext/oci8 
These only operate on arrays.
 2018-12-07 23:21:32 +11:00
Christopher Jones
171389b435 Merge branch 'PHP-7.2' into PHP-7.3 2018-12-07 23:20:27 +11:00
Christopher Jones
b797818e09 Simplify based on feedback from nikic 2018-12-07 23:07:37 +11:00
Christopher Jones
91776f7264 Sync with test files 2018-12-07 21:41:34 +11:00
Stanislav Malyshev
36534afd10 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix null pointer deref in qprint-encode filter (bug #77231)
 2018-12-03 10:20:07 -08:00
Stanislav Malyshev
a9ef7ecc60 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix null pointer deref in qprint-encode filter (bug #77231)
 2018-12-03 10:20:02 -08:00
Stanislav Malyshev
d5dc3c69f9 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix null pointer deref in qprint-encode filter (bug #77231)
 2018-12-03 10:19:57 -08:00
Stanislav Malyshev
036bc5c1fb Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix null pointer deref in qprint-encode filter (bug #77231)
 2018-12-03 10:19:49 -08:00
Stanislav Malyshev
78bffa72c1 Fix null pointer deref in qprint-encode filter (bug #77231) 2018-12-03 10:19:08 -08:00
Stanislav Malyshev
3d8d13f7b9 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix bug #77143 - add more checks to buffer reads
  Fix bug #77143 - add more checks to buffer reads
  Fix #77020: null pointer dereference in imap_mail
  Don't need interactive progress on git clones in Travis
  Fix TSRM signature - php_stream_stat macro has it's own TSRM
  Regenerate certificates for openssl tests
  Improve test for bug77022
 2018-12-03 00:42:55 -08:00
Stanislav Malyshev
8fff90250b Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #77143 - add more checks to buffer reads
  Fix bug #77143 - add more checks to buffer reads
  Fix #77020: null pointer dereference in imap_mail
 2018-12-03 00:42:50 -08:00
Stanislav Malyshev
8ab5d22332 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #77143 - add more checks to buffer reads
  Fix bug #77143 - add more checks to buffer reads
  Fix #77020: null pointer dereference in imap_mail
 2018-12-03 00:42:45 -08:00
Stanislav Malyshev
5718d73dbb Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix bug #77143 - add more checks to buffer reads
 2018-12-03 00:42:35 -08:00
Stanislav Malyshev
48f0f73f75 Fix bug #77143 - add more checks to buffer reads 2018-12-03 00:41:46 -08:00