clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 03:17:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
109,218 Commits 491 Branches 1,363 Tags 846 MiB
d460e06cb9
Commit Graph

109218 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christoph M. Becker
b0177d3892 Fix version numbers in main branch 
This should have already happened, when `PHP-7.3.0` was branched.
 2018-12-10 00:16:23 +01: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
Derick Rethans
77b1f5baa3 Back to -dev 
This should have been done as soon as PHP-7.3.0 was branched.
 2018-12-09 16:23:31 +00:00
Christopher Jones
8c37d5f451 Add OCI8 changes 2018-12-09 20:56:25 +11: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
Ryan Schmidt
4fb019994a Fix __zend_cpuid on i386 PIC without __cpuid_count 
Closes https://bugs.php.net/bug.php?id=76654
 2018-12-08 09:52:52 -06:00
Remi Collet
cb3a1df946 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  add imap.enable_insecure_rsh in php.ini
 2018-12-08 10:25:20 +01:00
Remi Collet
fd0077bf06 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  add imap.enable_insecure_rsh in php.ini
 2018-12-08 10:25:05 +01:00
Remi Collet
4288674651 add imap.enable_insecure_rsh in php.ini 2018-12-08 10:24:36 +01:00
Christopher Jones
a5991a2f9f Merge branch 'PHP-7.3' of https://git.php.net/repository/php-src into PHP-7.3 2018-12-08 20:20:04 +11:00
Christopher Jones
290671e7f2 Merge branch 'PHP-7.2' of https://git.php.net/repository/php-src into PHP-7.2 2018-12-08 20:19:59 +11: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
Remi Collet
1de2ff2e5e Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  missing entry for #77020
  missing entry for #77020
 2018-12-08 10:07:20 +01:00
Remi Collet
431ff36f51 missing entry for #77020 2018-12-08 10:07:01 +01:00
Remi Collet
da90b477c6 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  missing entry for #77020
 2018-12-08 10:06:34 +01:00
Remi Collet
9b8f2417ad missing entry for #77020 2018-12-08 10:06:19 +01: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
78c299ae2d Update NEWS 2018-12-08 19:14:16 +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
Christoph M. Becker
327e2d0153 [ci skip] Fix NEWS wrt. ChangeLog conversion 
We have to be rather picky in this regard; otherwise we need to
manually post process the ChangeLog.
 2018-12-06 17:15:43 +01:00
Christoph M. Becker
43329e85e6 [ci skip] Fix typo 2018-12-06 00:24:25 +01:00
Ferenc Kovacs
c7095bd607 Merge branch 'PHP-7.2' into PHP-7.3 2018-12-05 09:44:22 +01:00
Ferenc Kovacs
bc32061dba Merge branch 'PHP-7.1' into PHP-7.2 2018-12-05 09:36:31 +01:00
Ferenc Kovacs
6cbdc5e207 Merge branch 'PHP-7.0' into PHP-7.1 2018-12-05 09:30:20 +01:00