clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
105,248 Commits 491 Branches 1,363 Tags 844 MiB
557edb75c0
Commit Graph

105248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabien Villepinte
557edb75c0 Add tests for UConverter::getStandards() 2017-10-28 14:03:05 +02:00
Michael Kliewe
ba0ef9139c convert spaces to tabs in ext/ftp/tests/server.inc 2017-10-28 13:02:23 +02:00
Michael Kliewe
7d5bf6e269 Add tests for ftp_rename 2017-10-28 13:02:23 +02:00
Nikita Popov
8d54f98e33 Merge branch 'PHP-7.2' 2017-10-28 12:58:43 +02:00
Nikita Popov
58f90ab569 Merge branch 'PHP-7.1' into PHP-7.2 2017-10-28 12:58:23 +02:00
Nikita Popov
27856f64c3 Merge branch 'PHP-7.0' into PHP-7.1 2017-10-28 12:57:46 +02:00
Fabien Villepinte
938f256ed9 Fix bug #75434 Wrong reflection for mysqli_fetch_all function 2017-10-28 12:57:25 +02:00
Sara Golemon
352b406650 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Don't optimize input arrays with suffix holes
 2017-10-27 13:07:50 -04:00
Sara Golemon
cc96166f74
Don't optimize input arrays with suffix holes 2017-10-27 13:07:33 -04:00
Joe Watkins
5ce7113467
Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix bug #75307 Wrong reflection for openssl_open function
 2017-10-27 16:07:30 +01:00
Joe Watkins
f2367d4626
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #75307 Wrong reflection for openssl_open function
 2017-10-27 16:06:57 +01:00
Joe Watkins
14be7dcf8e
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #75307 Wrong reflection for openssl_open function
 2017-10-27 16:06:29 +01:00
Fabien Villepinte
51ea2cfbe1
Fix bug #75307 Wrong reflection for openssl_open function 2017-10-27 16:06:01 +01:00
Anatol Belski
0ab89a5d37 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Skip test on PostgreSQL 10
 2017-10-27 16:24:22 +02:00
Anatol Belski
cbf385e68c Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Skip test on PostgreSQL 10
 2017-10-27 16:23:50 +02:00
Anatol Belski
005205714b Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Skip test on PostgreSQL 10
 2017-10-27 16:23:19 +02:00
Anatol Belski
15a71fe045 Skip test on PostgreSQL 10 
The 42P18 error is not produced by the server anymore.
 2017-10-27 16:19:42 +02:00
Sara Golemon
fabb5b7a74
array_slice() passthrough for preserve_keys=true as well 2017-10-27 10:14:03 -04:00
Sara Golemon
e751e6ceba
Do not create a new array when slicing all of input array. 2017-10-27 10:09:05 -04:00
Anatol Belski
25da0bd658 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix test compat for PostgreSQL 10
 2017-10-27 15:05:15 +02:00
Anatol Belski
f936a17c12 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix test compat for PostgreSQL 10
 2017-10-27 15:04:54 +02:00
Anatol Belski
36b27f2ba5 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix test compat for PostgreSQL 10
 2017-10-27 15:04:29 +02:00
Anatol Belski
24b1bb0abd Fix test compat for PostgreSQL 10 2017-10-27 14:58:43 +02:00
Anatol Belski
bf43ab53ae Merge branch 'PHP-7.2' 
* PHP-7.2:
  Apply upstream patch for CVE-2017-14107
  Backport and apply upstream patch for CVE-2017-14107
 2017-10-27 14:18:55 +02:00
Anatol Belski
40f76c9f0c Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Apply upstream patch for CVE-2017-14107
  Backport and apply upstream patch for CVE-2017-14107
 2017-10-27 14:18:27 +02:00
Anatol Belski
211dacd7b5 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Apply upstream patch for CVE-2017-14107
  Backport and apply upstream patch for CVE-2017-14107
 2017-10-27 14:17:57 +02:00
Dmitry Stogov
cf67a421e9 Use per-request heap instead of system one 2017-10-27 14:45:54 +03:00
Dmitry Stogov
8e01026b82 Extend zend_register_class_alias_ex() with additional argument to allow creating persistent or per-request aliases 2017-10-27 14:44:21 +03:00
Dmitry Stogov
0136ecb69a Makrk persistent resources and references with GC_PERSISTENT flag 2017-10-27 14:42:06 +03:00
Anatol Belski
10dc1950f7 Apply upstream patch for CVE-2017-14107 2017-10-27 13:20:15 +02:00
Anatol Belski
f0a42d9fe4 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Backport and apply upstream patch for CVE-2017-14107
 2017-10-27 13:18:41 +02:00
Anatol Belski
f6e8ce8121 Backport and apply upstream patch for CVE-2017-14107 2017-10-27 13:16:56 +02:00
Dmitry Stogov
1ab0d820da Reverted constant related change (this should be handled togrther with ohter constant related places) 2017-10-26 22:43:45 +03:00
Anatol Belski
87a6b29477 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Binary SDK 2.0.12 stable
 2017-10-26 21:27:32 +02:00
Anatol Belski
f577a03c04 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Binary SDK 2.0.12 stable
 2017-10-26 21:27:09 +02:00
Anatol Belski
fb1c573a29 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Binary SDK 2.0.12 stable
 2017-10-26 21:26:03 +02:00
Anatol Belski
9eb6f86765 Binary SDK 2.0.12 stable 2017-10-26 21:25:08 +02:00
Dmitry Stogov
aeca761856 Removed useless reallocations 2017-10-26 19:13:53 +03:00
Dmitry Stogov
0366684ce3 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed indirect modification of magic ArrayAccess method arguments
 2017-10-26 16:17:49 +03:00
Dmitry Stogov
1d846fdfb2 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed indirect modification of magic ArrayAccess method arguments
 2017-10-26 16:07:49 +03:00
Dmitry Stogov
503df277ab Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed indirect modification of magic ArrayAccess method arguments
 2017-10-26 16:04:20 +03:00
Dmitry Stogov
98eee90734 Fixed indirect modification of magic ArrayAccess method arguments 2017-10-26 16:03:42 +03:00
Dmitry Stogov
e95301b785 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Backport tests
 2017-10-26 14:12:58 +03:00
Dmitry Stogov
25d988e91a Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Backport tests
 2017-10-26 14:12:45 +03:00
Dmitry Stogov
d3146889ab Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Backport tests
 2017-10-26 14:12:33 +03:00
Dmitry Stogov
502cfddf28 Backport tests 2017-10-26 14:12:08 +03:00
Dmitry Stogov
0772b32ef6 Restore object copying on magic method calls (It was removed in master only). 2017-10-26 14:04:42 +03:00
Dmitry Stogov
b09e398304 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed indirect modification of magic method arguments.
 2017-10-26 13:35:39 +03:00
Dmitry Stogov
e3997b2c82 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed indirect modification of magic method arguments.
 2017-10-26 13:12:52 +03:00
Dmitry Stogov
177cdcf313 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed indirect modification of magic method arguments.
 2017-10-26 13:11:59 +03:00