]> granicus.if.org Git - php/log
projects / php / log
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
php
8 years agoMerge branch 'pull-request/1755'
commit | commitdiff | tree
Joe Watkins [Fri, 6 Jan 2017 07:40:20 +0000 (07:40 +0000)]
Merge branch 'pull-request/1755'

* pull-request/1755:
  Fix bug #71519 Add 'serialNumberHex' variable to openssl_x509_parse

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Joe Watkins [Fri, 6 Jan 2017 07:29:09 +0000 (07:29 +0000)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  add stream_socket_sendto test from PR #1804

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Joe Watkins [Fri, 6 Jan 2017 07:28:56 +0000 (07:28 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  add stream_socket_sendto test from PR #1804

8 years agoadd stream_socket_sendto test from PR #1804
commit | commitdiff | tree
Joe Watkins [Fri, 6 Jan 2017 07:27:31 +0000 (07:27 +0000)]
add stream_socket_sendto test from PR #1804

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Joe Watkins [Fri, 6 Jan 2017 06:58:08 +0000 (06:58 +0000)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed #69442 closing of fd incorrect when PTS enabled

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Joe Watkins [Fri, 6 Jan 2017 06:57:35 +0000 (06:57 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed #69442 closing of fd incorrect when PTS enabled

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Joe Watkins [Fri, 6 Jan 2017 06:57:35 +0000 (06:57 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed #69442 closing of fd incorrect when PTS enabled

8 years agoMerge branch 'pull-request/1588' into PHP-7.0
commit | commitdiff | tree
Joe Watkins [Fri, 6 Jan 2017 06:55:09 +0000 (06:55 +0000)]
Merge branch 'pull-request/1588' into PHP-7.0

* pull-request/1588:
  Fixed #69442 closing of fd incorrect when PTS enabled

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Joe Watkins [Fri, 6 Jan 2017 06:07:31 +0000 (06:07 +0000)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed bug #69582 session not readable by root in CLI

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Joe Watkins [Fri, 6 Jan 2017 06:05:38 +0000 (06:05 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #69582 session not readable by root in CLI

8 years agoMerge branch 'pull-request/1360' into PHP-7.0
commit | commitdiff | tree
Joe Watkins [Fri, 6 Jan 2017 06:02:36 +0000 (06:02 +0000)]
Merge branch 'pull-request/1360' into PHP-7.0

* pull-request/1360:
  Fixed bug #69582 session not readable by root in CLI
  news entry for PR #1360

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Joe Watkins [Fri, 6 Jan 2017 05:55:36 +0000 (05:55 +0000)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix inappropriate warning in FPM log

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Joe Watkins [Fri, 6 Jan 2017 05:55:14 +0000 (05:55 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix inappropriate warning in FPM log

8 years agoMerge branch 'pull-request/1311' into PHP-7.0
commit | commitdiff | tree
Joe Watkins [Fri, 6 Jan 2017 05:54:42 +0000 (05:54 +0000)]
Merge branch 'pull-request/1311' into PHP-7.0

* pull-request/1311:
  fix inappropriate warning in FPM log

8 years agoMerge branch 'pull-request/1303'
commit | commitdiff | tree
Joe Watkins [Fri, 6 Jan 2017 05:46:10 +0000 (05:46 +0000)]
Merge branch 'pull-request/1303'

* pull-request/1303:
  Distinguish between unmatched subpatterns and empty matches in preg_*()
  news entry for PR #1303

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Joe Watkins [Fri, 6 Jan 2017 05:41:00 +0000 (05:41 +0000)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fix #70103: ZipArchive::addGlob ignores remove_all_path option
  news entry for PR #1430

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Joe Watkins [Fri, 6 Jan 2017 05:40:08 +0000 (05:40 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix #70103: ZipArchive::addGlob ignores remove_all_path option
  news entry for PR #1430

8 years agoMerge branch 'pull-request/1430' into PHP-7.0
commit | commitdiff | tree
Joe Watkins [Fri, 6 Jan 2017 05:38:47 +0000 (05:38 +0000)]
Merge branch 'pull-request/1430' into PHP-7.0

* pull-request/1430:
  Fix #70103: ZipArchive::addGlob ignores remove_all_path option
  news entry for PR 1430

8 years agoMerge branch 'master' of git.php.net:/php-src
commit | commitdiff | tree
Joe Watkins [Fri, 6 Jan 2017 05:33:49 +0000 (05:33 +0000)]
Merge branch 'master' of git.php.net:/php-src

* 'master' of git.php.net:/php-src:
  add skip when json not loaded

8 years agoMerge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
commit | commitdiff | tree
Joe Watkins [Fri, 6 Jan 2017 05:33:22 +0000 (05:33 +0000)]
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1

* 'PHP-7.1' of git.php.net:/php-src:
  add skip when json not loaded

8 years agoMerge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
commit | commitdiff | tree
Joe Watkins [Fri, 6 Jan 2017 05:32:55 +0000 (05:32 +0000)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0

* 'PHP-7.0' of git.php.net:/php-src:
  add skip when json not loaded

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Joe Watkins [Fri, 6 Jan 2017 05:27:30 +0000 (05:27 +0000)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Increase realpath_cache_size default value
  add UPGRADING note for realpath_cache_size

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Joe Watkins [Fri, 6 Jan 2017 05:27:04 +0000 (05:27 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Increase realpath_cache_size default value
  add UPGRADING note for realpath_cache_size

8 years agoMerge branch 'realpath_cache_size_update' into PHP-7.0
commit | commitdiff | tree
Joe Watkins [Fri, 6 Jan 2017 05:25:49 +0000 (05:25 +0000)]
Merge branch 'realpath_cache_size_update' into PHP-7.0

* realpath_cache_size_update:
  Increase realpath_cache_size default value
  add UPGRADING note regarding realpath_cache_size

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Remi Collet [Fri, 6 Jan 2017 05:27:39 +0000 (06:27 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  add skip when json not loaded

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Remi Collet [Fri, 6 Jan 2017 05:27:25 +0000 (06:27 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  add skip when json not loaded

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
commit | commitdiff | tree
Remi Collet [Fri, 6 Jan 2017 05:27:08 +0000 (06:27 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  add skip when json not loaded

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Joe Watkins [Fri, 6 Jan 2017 05:27:04 +0000 (05:27 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Increase realpath_cache_size default value

8 years agoMerge branch 'realpath_cache_size_update' into PHP-7.0
commit | commitdiff | tree
Joe Watkins [Fri, 6 Jan 2017 05:25:49 +0000 (05:25 +0000)]
Merge branch 'realpath_cache_size_update' into PHP-7.0

* realpath_cache_size_update:
  Increase realpath_cache_size default value

8 years agoUpdate php.ini-development
commit | commitdiff | tree
Markus Staab [Thu, 5 Jan 2017 15:12:17 +0000 (16:12 +0100)]
Update php.ini-development

8 years agoUpdate php.ini-production
commit | commitdiff | tree
Markus Staab [Thu, 5 Jan 2017 15:11:30 +0000 (16:11 +0100)]
Update php.ini-production

8 years agoupdated default per proposal
commit | commitdiff | tree
Markus Staab [Thu, 5 Jan 2017 09:18:48 +0000 (10:18 +0100)]
updated default per proposal

TODO: adjust php.ini defaults

8 years agoIncrease realpath_cache_size default value
commit | commitdiff | tree
Markus Staab [Tue, 3 Jan 2017 08:25:11 +0000 (09:25 +0100)]
Increase realpath_cache_size default value

8 years agoadd skip when json not loaded
commit | commitdiff | tree
Remi Collet [Fri, 6 Jan 2017 05:23:59 +0000 (06:23 +0100)]
add skip when json not loaded

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Fri, 6 Jan 2017 01:39:53 +0000 (02:39 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix deps dir for test data preparations

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Fri, 6 Jan 2017 01:37:10 +0000 (02:37 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix deps dir for test data preparations

8 years agofix deps dir for test data preparations
commit | commitdiff | tree
Anatol Belski [Fri, 6 Jan 2017 01:32:09 +0000 (02:32 +0100)]
fix deps dir for test data preparations

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Ferenc Kovacs [Fri, 6 Jan 2017 00:52:12 +0000 (01:52 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Ferenc Kovacs [Fri, 6 Jan 2017 00:50:08 +0000 (01:50 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
commit | commitdiff | tree
Ferenc Kovacs [Fri, 6 Jan 2017 00:48:24 +0000 (01:48 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years ago5.6.31 is next
commit | commitdiff | tree
Ferenc Kovacs [Fri, 6 Jan 2017 00:43:11 +0000 (01:43 +0100)]
5.6.31 is next

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Fri, 6 Jan 2017 00:32:40 +0000 (01:32 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  don't use separate deps for release branches

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Fri, 6 Jan 2017 00:29:45 +0000 (01:29 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  don't use separate deps for release branches

8 years agodon't use separate deps for release branches
commit | commitdiff | tree
Anatol Belski [Fri, 6 Jan 2017 00:24:41 +0000 (01:24 +0100)]
don't use separate deps for release branches

8 years agoreenable appveyor cache
commit | commitdiff | tree
Anatol Belski [Thu, 5 Jan 2017 22:42:15 +0000 (23:42 +0100)]
reenable appveyor cache

8 years agoclean appveyor cache
commit | commitdiff | tree
Anatol Belski [Thu, 5 Jan 2017 22:40:56 +0000 (23:40 +0100)]
clean appveyor cache

8 years agosync libmagic.patch
commit | commitdiff | tree
Anatol Belski [Thu, 5 Jan 2017 22:32:30 +0000 (23:32 +0100)]
sync libmagic.patch

8 years agorevert year change on bundled lib files
commit | commitdiff | tree
Anatol Belski [Thu, 5 Jan 2017 22:26:20 +0000 (23:26 +0100)]
revert year change on bundled lib files

8 years agoadd missing condition
commit | commitdiff | tree
Anatol Belski [Thu, 5 Jan 2017 22:16:09 +0000 (23:16 +0100)]
add missing condition

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Christoph M. Becker [Thu, 5 Jan 2017 17:52:03 +0000 (18:52 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fix #70417: PharData::compress() doesn't close temp file

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Christoph M. Becker [Thu, 5 Jan 2017 17:50:31 +0000 (18:50 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix #70417: PharData::compress() doesn't close temp file

8 years agoMerge branch 'pull-request/2278' into PHP-7.0
commit | commitdiff | tree
Christoph M. Becker [Thu, 5 Jan 2017 17:45:16 +0000 (18:45 +0100)]
Merge branch 'pull-request/2278' into PHP-7.0

* pull-request/2278:
  Fix #70417: PharData::compress() doesn't close temp file

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Christoph M. Becker [Thu, 5 Jan 2017 17:42:58 +0000 (18:42 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  wrong version

# Conflicts:
# main/php_version.h

8 years agowrong version
commit | commitdiff | tree
Joe Watkins [Thu, 5 Jan 2017 17:00:40 +0000 (17:00 +0000)]
wrong version

8 years agoMerge branch 'master' of git.php.net:/php-src
commit | commitdiff | tree
Joe Watkins [Thu, 5 Jan 2017 16:59:23 +0000 (16:59 +0000)]
Merge branch 'master' of git.php.net:/php-src

* 'master' of git.php.net:/php-src:

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Joe Watkins [Thu, 5 Jan 2017 16:58:46 +0000 (16:58 +0000)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  merge PHP-7.1.1RC1

8 years agoI am bad at counting (wrong date in news)
commit | commitdiff | tree
Joe Watkins [Thu, 5 Jan 2017 16:56:26 +0000 (16:56 +0000)]
I am bad at counting (wrong date in news)

8 years agobump version after release
commit | commitdiff | tree
Joe Watkins [Thu, 5 Jan 2017 16:50:52 +0000 (16:50 +0000)]
bump version after release

8 years agoFix #70417: PharData::compress() doesn't close temp file
commit | commitdiff | tree
Christoph M. Becker [Thu, 3 Sep 2015 14:37:29 +0000 (16:37 +0200)]
Fix #70417: PharData::compress() doesn't close temp file

According to the comment, it has not been deemed necessary to close compressed
files. However, we don't want to keep unclosed file handles to save ressources.
So we're also closing compressed archives, if they're not aliased.

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Thu, 5 Jan 2017 13:04:30 +0000 (14:04 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Revert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into PHP-7.0"

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Thu, 5 Jan 2017 13:02:43 +0000 (14:02 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Revert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into PHP-7.0"

8 years agoRevert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into...
commit | commitdiff | tree
Anatol Belski [Thu, 5 Jan 2017 12:59:01 +0000 (13:59 +0100)]
Revert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into PHP-7.0"

This reverts commit a8931df672bb173ef81c10e4fc2a5de23789c935, reversing
changes made to f2f35a2b27d0074ab015b8a37d6563eec74147d5.

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Nikita Popov [Thu, 5 Jan 2017 10:38:47 +0000 (11:38 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Nikita Popov [Thu, 5 Jan 2017 10:38:17 +0000 (11:38 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
commit | commitdiff | tree
Nikita Popov [Thu, 5 Jan 2017 10:38:05 +0000 (11:38 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix printf modifier
commit | commitdiff | tree
Nikita Popov [Thu, 5 Jan 2017 10:37:06 +0000 (11:37 +0100)]
Fix printf modifier

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Joe Watkins [Thu, 5 Jan 2017 06:54:52 +0000 (06:54 +0000)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fix php-fpm.service.in

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Joe Watkins [Thu, 5 Jan 2017 06:54:37 +0000 (06:54 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix php-fpm.service.in

8 years agoMerge branch 'pull-request/1256' into PHP-7.0
commit | commitdiff | tree
Joe Watkins [Thu, 5 Jan 2017 06:54:19 +0000 (06:54 +0000)]
Merge branch 'pull-request/1256' into PHP-7.0

* pull-request/1256:
  Fix php-fpm.service.in

8 years agoMerge branch 'pull-request/2275'
commit | commitdiff | tree
Joe Watkins [Thu, 5 Jan 2017 05:54:34 +0000 (05:54 +0000)]
Merge branch 'pull-request/2275'

* pull-request/2275:
  Fix overrun in exif's "Illegal components" error message.

8 years agoFix overrun in exif's "Illegal components" error message.
commit | commitdiff | tree
Mitch Hagstrand [Thu, 5 Jan 2017 01:44:00 +0000 (17:44 -0800)]
Fix overrun in exif's "Illegal components" error message.

The variables "components" is an integer, but is being
output as long. As a result it is printing 8 bytes
instead of 4 bytes.

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Thu, 5 Jan 2017 00:54:53 +0000 (01:54 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  quick fix for the base branch version parsing, not perfect still

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Thu, 5 Jan 2017 00:52:37 +0000 (01:52 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  quick fix for the base branch version parsing, not perfect still

8 years agoquick fix for the base branch version parsing, not perfect still
commit | commitdiff | tree
Anatol Belski [Thu, 5 Jan 2017 00:49:36 +0000 (01:49 +0100)]
quick fix for the base branch version parsing, not perfect still

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Thu, 5 Jan 2017 00:16:37 +0000 (01:16 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  move dev to next

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Thu, 5 Jan 2017 00:14:27 +0000 (01:14 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  move dev to next

8 years agomove dev to next
commit | commitdiff | tree
Anatol Belski [Thu, 5 Jan 2017 00:12:18 +0000 (01:12 +0100)]
move dev to next

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Nikita Popov [Wed, 4 Jan 2017 23:50:12 +0000 (00:50 +0100)]
Merge branch 'PHP-7.1'

8 years agoAdd Z_EXTRA macro
commit | commitdiff | tree
Nikita Popov [Wed, 4 Jan 2017 23:49:19 +0000 (00:49 +0100)]
Add Z_EXTRA macro

For use with u2 values which don't deserve a custom macro...

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Nikita Popov [Wed, 4 Jan 2017 23:36:53 +0000 (00:36 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Nikita Popov [Wed, 4 Jan 2017 23:28:21 +0000 (00:28 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
commit | commitdiff | tree
Nikita Popov [Wed, 4 Jan 2017 23:22:25 +0000 (00:22 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoAdd tests for delayed __wakeup()
commit | commitdiff | tree
Nikita Popov [Wed, 4 Jan 2017 23:20:56 +0000 (00:20 +0100)]
Add tests for delayed __wakeup()

8 years agoImplement delayed __wakeup
commit | commitdiff | tree
Nikita Popov [Wed, 4 Jan 2017 23:19:26 +0000 (00:19 +0100)]
Implement delayed __wakeup

8 years agoMerge branch 'pull-request/2274' into PHP-7.1
commit | commitdiff | tree
Joe Watkins [Wed, 4 Jan 2017 22:25:45 +0000 (22:25 +0000)]
Merge branch 'pull-request/2274' into PHP-7.1

* pull-request/2274:
  Update copyright headers to 2017

8 years agoMerge branch 'pull-request/2273' into PHP-7.0
commit | commitdiff | tree
Joe Watkins [Wed, 4 Jan 2017 22:24:34 +0000 (22:24 +0000)]
Merge branch 'pull-request/2273' into PHP-7.0

* pull-request/2273:
  Update copyright headers to 2017

8 years agoUpdate copyright header to 2017 in calendar.c
commit | commitdiff | tree
Sammy Kaye Powers [Wed, 4 Jan 2017 17:24:25 +0000 (11:24 -0600)]
Update copyright header to 2017 in calendar.c

8 years agoUpdate copyright headers to 2017
commit | commitdiff | tree
Sammy Kaye Powers [Wed, 4 Jan 2017 17:23:42 +0000 (11:23 -0600)]
Update copyright headers to 2017

8 years agoUpdate copyright header to 2017 in calendar.c
commit | commitdiff | tree
Sammy Kaye Powers [Wed, 4 Jan 2017 17:15:47 +0000 (11:15 -0600)]
Update copyright header to 2017 in calendar.c

8 years agoUpdate copyright headers to 2017
commit | commitdiff | tree
Sammy Kaye Powers [Wed, 4 Jan 2017 17:14:55 +0000 (11:14 -0600)]
Update copyright headers to 2017

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Wed, 4 Jan 2017 16:24:26 +0000 (17:24 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  switch to the beta1 SDK for AppVeyor build

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Wed, 4 Jan 2017 16:21:34 +0000 (17:21 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  switch to the beta1 SDK for AppVeyor build

8 years agoswitch to the beta1 SDK for AppVeyor build
commit | commitdiff | tree
Anatol Belski [Wed, 4 Jan 2017 12:31:38 +0000 (13:31 +0100)]
switch to the beta1 SDK for AppVeyor build

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Joe Watkins [Wed, 4 Jan 2017 14:51:41 +0000 (14:51 +0000)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  remove duplicate test

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Joe Watkins [Wed, 4 Jan 2017 14:51:21 +0000 (14:51 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  remove duplicate test

8 years agoremove duplicate test
commit | commitdiff | tree
Joe Watkins [Wed, 4 Jan 2017 14:50:59 +0000 (14:50 +0000)]
remove duplicate test

8 years agoMerge branch 'master' of git.php.net:/php-src
commit | commitdiff | tree
Joe Watkins [Wed, 4 Jan 2017 14:37:11 +0000 (14:37 +0000)]
Merge branch 'master' of git.php.net:/php-src

* 'master' of git.php.net:/php-src:
  Implement #69606: Support BMPs (added in GD 2.1.0)

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Joe Watkins [Wed, 4 Jan 2017 14:36:51 +0000 (14:36 +0000)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix test

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Joe Watkins [Wed, 4 Jan 2017 14:36:37 +0000 (14:36 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix test

8 years agofix test
commit | commitdiff | tree
Joe Watkins [Wed, 4 Jan 2017 14:36:18 +0000 (14:36 +0000)]
fix test

next
Unnamed repository; edit this file 'description' to name the repository.