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
100,625 Commits 494 Branches 1,367 Tags 785 MiB
8ef5a50e2d
Commit Graph

100625 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
8ef5a50e2d Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix dir separator in test
 2017-07-19 22:41:32 +02:00
Anatol Belski
f67a3cc9bd fix dir separator in test 2017-07-19 22:41:09 +02:00
Sara Golemon
a9e8239f45 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Do not allow using traits/interfaces/abstract classes as stream wrappers
 2017-07-19 14:01:00 -04:00
Sara Golemon
c9fd093127
Do not allow using traits/interfaces/abstract classes as stream wrappers 
Fixes https://bugs.php.net/bug.php?id=74951
 2017-07-19 14:00:00 -04:00
Lior Kaplan
2b36f3d71f Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Add oci8_failover.c to config.w32, follow up for commit 1b797f7a
 2017-07-19 17:26:38 +03:00
Lior Kaplan
2cca43b3ab Add oci8_failover.c to config.w32, follow up for commit 1b797f7a 2017-07-19 17:23:22 +03:00
Dmitry Stogov
4252f14299 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Reset globals on startup or restart
 2017-07-19 15:36:24 +03:00
Dmitry Stogov
e5beb4e828 Reset globals on startup or restart 2017-07-19 15:35:10 +03:00
Nikita Popov
8e7c99acf4 Merge branch 'PHP-7.0' into PHP-7.1 2017-07-18 22:16:11 +02:00
andrewnester
afc22828ea Fixed #74699 - Broken ArrayIterator unserializing 2017-07-18 22:14:11 +02:00
Nikita Popov
4e9158da76 Merge branch 'PHP-7.0' into PHP-7.1 2017-07-18 21:45:35 +02:00
YaoGuai
51cdd3dc50 Fix check of mysql_commit() return value 
For mysql_commit() everything non-zero is an error.
 2017-07-18 21:45:02 +02:00
Andrew Nester
6c32d271d2 Fixed #74892 - Fixed URL rewriting for urls started with # 2017-07-18 21:20:03 +02:00
Joe Watkins
f4323248ec
bump versions 2017-07-18 17:21:19 +01:00
Anatol Belski
657609ebae Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Exclude ext/ftp from AppVeyor test run
 2017-07-18 12:09:58 +02:00
Anatol Belski
0da10134f2 Exclude ext/ftp from AppVeyor test run 
as the tests depend on fork() and otherwise an extra setup would be
needed anyway.
 2017-07-18 12:08:31 +02:00
Anatol Belski
735468a0b8 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  move to 7.0.23 for dev
 2017-07-18 10:26:10 +02:00
Anatol Belski
649027b963 move to 7.0.23 for dev 2017-07-18 10:25:40 +02:00
Anatol Belski
65d5e025a7 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix missing var for phpize
 2017-07-17 19:40:31 +02:00
Anatol Belski
4ef9f536ba fix missing var for phpize 
(cherry picked from commit 36c3d71407)
 2017-07-17 19:38:50 +02:00
Joe Watkins
e0282c3b58
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74906 redirecting incorrect include <sys/errno.h>
 2017-07-17 06:55:02 +01:00
Peter Kokot
4d08b9dac0
Fixed bug #74906 redirecting incorrect include <sys/errno.h> 2017-07-17 06:54:27 +01:00
Joe Watkins
2e82ed9b73
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug 74913 redirecting incorrect include <sys/poll.h>
 2017-07-17 06:51:47 +01:00
Peter Kokot
0db20a7cb1
Fixed bug 74913 redirecting incorrect include <sys/poll.h> 2017-07-17 06:50:59 +01:00
Anatol Belski
6cd140fdf8 Add test for bug #74923 2017-07-15 11:30:56 +02:00
Anatol Belski
0b5683e480 update NEWS 2017-07-14 21:07:48 +02:00
Anatol Belski
5d15fdc4a4 Fixed bug #74923 Crash when crawling through network share 2017-07-14 13:23:24 +02:00
Christopher Jones
3b60af90fd Merge branch 'PHP-7.0' into PHP-7.1 2017-07-14 14:13:33 +10:00
Christopher Jones
c1504b81d3 Bump OCI8 version for recent patch 2017-07-14 14:13:08 +10:00
Anatol Belski
91aad4bc81 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Guard against AppVeyor losing deps issue
 2017-07-12 15:40:00 +02:00
Anatol Belski
2f606dc5e8 Guard against AppVeyor losing deps issue 
Possibly due to concurrent build cache updates or some changes in
the remote image. Some locking mechanism still could be required.
 2017-07-12 15:37:40 +02:00
Anatol Belski
8b04e89ef0 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  increase poll timeout as false positives mitigation
 2017-07-12 14:49:58 +02:00
Anatol Belski
04cc2f6473 increase poll timeout as false positives mitigation 2017-07-12 14:38:12 +02:00
Anatol Belski
82acb58d8a update NEWS 2017-07-10 22:50:34 +02:00
Anatol Belski
3da01a9652 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  update NEWS
 2017-07-10 22:50:20 +02:00
Anatol Belski
3bcab31749 update NEWS 2017-07-10 22:49:55 +02:00
Anatol Belski
be531ce9f0 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  switch to next binary tools sdk version
 2017-07-10 21:45:43 +02:00
Anatol Belski
b47cff48de switch to next binary tools sdk version 2017-07-10 21:44:43 +02:00
Anatol Belski
7360e6a36f Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Revert "Add more constants, improve comments, and add tests"
 2017-07-10 17:01:25 +02:00
Anatol Belski
a797421e98 Revert "Add more constants, improve comments, and add tests" 
This reverts commit 0c4f11ecaa.
 2017-07-10 16:53:56 +02:00
Anatol Belski
fd08eaa8bc improve test 2017-07-10 13:49:44 +02:00
Joe Watkins
de32c9efc8
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  #73594 tests only check the extra params if dns_get_record is successful
 2017-07-10 06:55:53 +01:00
Pedro Magalhães
2689917b17
#73594 tests only check the extra params if dns_get_record is successful 2017-07-10 06:55:31 +01:00
Joe Watkins
ccd0ff3ac4
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74852 (property_exists returns true on unknown DateInterval property)
 2017-07-10 06:53:59 +01:00
jhdxr
5cf54f6073
Fixed bug #74852 (property_exists returns true on unknown DateInterval property) 2017-07-10 06:53:22 +01:00
Anatol Belski
7938b9ccac [ci skip] update NEWS 2017-07-09 15:02:40 +02:00
Anatol Belski
e89476a870 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  [ci skip] update NEWS
 2017-07-09 15:02:03 +02:00
Anatol Belski
62700f76cb [ci skip] update NEWS 2017-07-09 15:01:37 +02:00
Anatol Belski
02cc492015 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74883 SQLite3::__construct() produces "out of memory" exception with invalid flags
 2017-07-09 01:31:25 +02:00
Anatol Belski
b5338c0b7d Fixed bug #74883 SQLite3::__construct() produces "out of memory" exception with invalid flags 2017-07-08 23:52:22 +02:00