archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 01:14:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
99637 commits 526 branches 1434 tags 880 MiB
Commit graph

99637 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anatol Belski
28887fe41b skip this test for now as it seems to have issues running dev server 2016-09-23 18:07:08 +02:00
Anatol Belski
f9a699f6c3 Fixed bug #73037 SoapServer reports Bad Request when gzipped 
(cherry picked from commit 410c68788a)
 2016-09-23 18:06:12 +02:00
Christoph M. Becker
661dca594b Merge branch 'PHP-7.1' 2016-09-23 16:27:59 +02:00
Christoph M. Becker
f0a1188695 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-23 16:27:23 +02:00
Christoph M. Becker
be4489d488 Merge branch 'PHP-5.6' into PHP-7.0 2016-09-23 16:26:05 +02:00
Christoph M. Becker
9a2a45c1df Update NEWS 2016-09-23 16:23:58 +02:00
Anatol Belski
f59ea5d6a1 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #73037 SoapServer reports Bad Request when gzipped
 2016-09-23 16:08:09 +02:00
Anatol Belski
4b13f60278 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #73037 SoapServer reports Bad Request when gzipped
 2016-09-23 16:07:12 +02:00
Anatol Belski
410c68788a Fixed bug #73037 SoapServer reports Bad Request when gzipped 2016-09-23 16:02:50 +02:00
Christoph M. Becker
c1eb7d7bf0 Merge branch 'PHP-7.1' 2016-09-23 15:50:25 +02:00
Christoph M. Becker
bf35b31f56 Fix FreeType tests using UTF-8 font file names 
UTF-8 font file names are not yet supported on Windows[1], so we're skipping
the respective tests on this platform, but enable them on other platforms.

[1] <http://news.php.net/php.internals.win/1142>
 2016-09-23 15:49:21 +02:00
Julien Pauli
983f1e3618 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Formatting. Fix possible memory corruption in FPM SHM management
  fix every work call mmap
 2016-09-23 13:54:46 +02:00
Julien Pauli
974ba6be7a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Formatting. Fix possible memory corruption in FPM SHM management
  fix every work call mmap

Conflicts:
	sapi/fpm/fpm/fpm_scoreboard.c
 2016-09-23 13:54:22 +02:00
Julien Pauli
fbf87a8082 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Formatting. Fix possible memory corruption in FPM SHM management
  fix every work call mmap
 2016-09-23 13:53:22 +02:00
Julien Pauli
a22175b06f Formatting. Fix possible memory corruption in FPM SHM management 2016-09-23 13:52:58 +02:00
tom916
807004a446 fix every work call mmap 
fix fpm_scoreboard_free
 2016-09-23 13:52:58 +02:00
Christoph M. Becker
4ba11af40f Merge branch 'PHP-7.1' 2016-09-23 13:11:14 +02:00
Christoph M. Becker
8dfee1a777 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-23 12:57:10 +02:00
Christoph M. Becker
deda058751 Merge branch 'PHP-5.6' into PHP-7.0 2016-09-23 12:29:37 +02:00
Christoph M. Becker
726c5999eb Rework FreeType related tests 
Firstly, there is no fundamental difference between running the tests on
freetype before and after 2.4.10, so we re-join the respective test cases.

Secondly, there are some minor differences in the results depending on
architecture, freetype versions and config options, so we cater to that
by allowing small deviations from the expectations.
 2016-09-23 12:00:41 +02:00
Dmitry Stogov
18b09733f5 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  update NEWS
  update NEWS
 2016-09-23 12:27:15 +03:00
Dmitry Stogov
ab1b32f81a Removed redundand code 2016-09-23 12:26:30 +03:00
Anatol Belski
28104137cd Merge branch 'PHP-7.1' 
* PHP-7.1:
  update NEWS
  update NEWS
 2016-09-23 11:26:24 +02:00
Anatol Belski
681d3148cd update NEWS 2016-09-23 11:26:03 +02:00
Anatol Belski
8f256bebef Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  update NEWS
  phpdbg next command must stop when leaving function
 2016-09-23 11:25:33 +02:00
Anatol Belski
9ee913a773 update NEWS 2016-09-23 11:24:55 +02:00
Bob Weinand
a137a1e255 Merge branch 'PHP-7.0' 2016-09-23 03:29:56 +02:00
Bob Weinand
cf35dae6e2 phpdbg next command must stop when leaving function 2016-09-23 03:29:37 +02:00
Anatol Belski
a3ca6b09cd Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix bug #73121 Bundled PCRE doesn't compile because JIT isn't supported on s390
 2016-09-23 01:55:35 +02:00
Anatol Belski
f7e5481a10 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #73121 Bundled PCRE doesn't compile because JIT isn't supported on s390
 2016-09-23 01:55:17 +02:00
Anatol Belski
54d8053ac5 Fix bug #73121 Bundled PCRE doesn't compile because JIT isn't supported on s390 2016-09-23 01:52:42 +02:00
Anatol Belski
27c2273ae3 Merge branch 'master' of git.php.net:php-src 2016-09-22 17:05:51 +02:00
Anatol Belski
59c72a6edb Merge branch 'PHP-7.1' 
* PHP-7.1:
  update libs versions
  update libs versions
 2016-09-22 17:04:06 +02:00
Anatol Belski
5b46c2b67d Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  update libs versions
  update libs versions
 2016-09-22 17:03:49 +02:00
Anatol Belski
a95caa29bf Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  update libs versions
 2016-09-22 17:03:12 +02:00
Anatol Belski
11ff616d0f update libs versions 2016-09-22 17:02:54 +02:00
Anatol Belski
49c3fa43ad update libs versions 2016-09-22 17:01:02 +02:00
Dmitry Stogov
42db69058a Removed impossible condition 2016-09-22 17:58:45 +03:00
Nikita Popov
d02e2605a8 Merge branch 'PHP-7.1' 2016-09-22 12:50:36 +02:00
Nikita Popov
2205fadac5 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-22 12:50:29 +02:00
Nikita Popov
c38f88ddb0 Merge branch 'PHP-5.6' into PHP-7.0 2016-09-22 12:48:38 +02:00
Márcio Almada
4397306b32 fix bug related to #865 
In case USE_KEY flag is active, RegexIterator->accept() should keep it's
old behavior which is to accept keys mapping arrays.

This broke after PHP 5.5 but was not noticed due to lack of tests for USE_KEY.
 2016-09-22 12:46:19 +02:00
Nikita Popov
785064af05 Merge branch 'PHP-7.1' 2016-09-22 12:39:00 +02:00
Nikita Popov
781d92c806 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-22 12:38:48 +02:00
John Boehr
68e602ff0a Fix bug #69579 2016-09-22 12:38:07 +02:00
Nikita Popov
328ecb486f Merge branch 'PHP-7.1' 2016-09-22 12:35:29 +02:00
Nikita Popov
7cd2494bb8 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-22 12:34:55 +02:00
John Boehr
8e313becf4 Fix bug #69579 2016-09-22 12:32:37 +02:00
Anatol Belski
fc92130aa7 Merge branch 'PHP-7.1' 
* PHP-7.1:
  update NEWS
 2016-09-22 12:08:06 +02:00
Anatol Belski
d4144a6ec9 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  update NEWS
 2016-09-22 12:07:37 +02:00