php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-20 14:31:06 +02:00
Code Issues Packages Projects Releases Wiki Activity
99,498 Commits 547 Branches 1,483 Tags
a1ff6e72018d1e7de7ce9bd2902a2c7b77b7e240
Commit Graph

99498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Watkins
a1ff6e7201 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
 2017-01-06 05:33:22 +00:00
Joe Watkins
d5a1c5a96b 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
 2017-01-06 05:31:29 +00:00
Remi Collet
d18d3e7825 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  add skip when json not loaded
 2017-01-06 06:27:25 +01:00
Remi Collet
4f1335cd4c Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  add skip when json not loaded
 2017-01-06 06:27:08 +01:00
Joe Watkins
bebfdec0a2 Merge branch 'realpath_cache_size_update' into PHP-7.0 
* realpath_cache_size_update:
  Increase realpath_cache_size default value
 2017-01-06 05:25:49 +00:00
Markus Staab
49b2cbf763 Update php.ini-development 2017-01-06 05:25:13 +00:00
Markus Staab
81fb61f97c Update php.ini-production 2017-01-06 05:25:10 +00:00
Markus Staab
782b84c6d5 updated default per proposal 
TODO: adjust php.ini defaults
 2017-01-06 05:25:08 +00:00
Markus Staab
66b698c3cf Increase realpath_cache_size default value 2017-01-06 05:25:04 +00:00
Remi Collet
db890956ec add skip when json not loaded 2017-01-06 06:23:59 +01:00
Anatol Belski
1f6a9060f9 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix deps dir for test data preparations
 2017-01-06 02:37:10 +01:00
Anatol Belski
a7c444b939 fix deps dir for test data preparations 2017-01-06 02:34:03 +01:00
Ferenc Kovacs
1ed188011a Merge branch 'PHP-7.0' into PHP-7.1 2017-01-06 01:50:08 +01:00
Ferenc Kovacs
a43a3798d3 Merge branch 'PHP-5.6' into PHP-7.0 2017-01-06 01:48:24 +01:00
Ferenc Kovacs
3b14d7b84b 5.6.31 is next 2017-01-06 01:43:11 +01:00
Anatol Belski
460247c742 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  don't use separate deps for release branches
 2017-01-06 01:29:45 +01:00
Anatol Belski
372144508c don't use separate deps for release branches 2017-01-06 01:24:41 +01:00
Christoph M. Becker
e7ce861def Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix #70417: PharData::compress() doesn't close temp file
 2017-01-05 18:51:04 +01:00
Christoph M. Becker
183a34a5cf Merge branch 'pull-request/2278' into PHP-7.0 
* pull-request/2278:
  Fix #70417: PharData::compress() doesn't close temp file
 2017-01-05 18:49:52 +01:00
Joe Watkins
4cce1e9a94 wrong version 2017-01-05 17:00:40 +00:00
Joe Watkins
3b741353e1 I am bad at counting (wrong date in news) 2017-01-05 16:56:26 +00:00
Joe Watkins
e627aa9841 bump version after release 2017-01-05 16:50:52 +00:00
Christoph M. Becker
995ecffbb2 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.
 2017-01-05 14:12:31 +01:00
Anatol Belski
34c1040e22 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"
 2017-01-05 14:02:43 +01:00
Anatol Belski
57736cc937 Revert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into PHP-7.0" 
This reverts commit a8931df672, reversing
changes made to f2f35a2b27.
 2017-01-05 13:59:01 +01:00
Nikita Popov
769e17ce9b Merge branch 'PHP-7.0' into PHP-7.1 2017-01-05 11:38:17 +01:00
Nikita Popov
2022dacb99 Merge branch 'PHP-5.6' into PHP-7.0 2017-01-05 11:38:05 +01:00
Nikita Popov
900b17b15f Fix printf modifier 2017-01-05 11:37:06 +01:00
Joe Watkins
c370024c2c Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix php-fpm.service.in
 2017-01-05 06:54:37 +00:00
Joe Watkins
b037c43497 Merge branch 'pull-request/1256' into PHP-7.0 
* pull-request/1256:
  Fix php-fpm.service.in
 2017-01-05 06:54:19 +00:00
Anatol Belski
b7b3d50f78 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  quick fix for the base branch version parsing, not perfect still
 2017-01-05 01:52:37 +01:00
Anatol Belski
2ca5aa9418 quick fix for the base branch version parsing, not perfect still 2017-01-05 01:49:36 +01:00
Anatol Belski
db19cb243e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  move dev to next
 2017-01-05 01:14:27 +01:00
Anatol Belski
997d902762 move dev to next 2017-01-05 01:12:18 +01:00
Nikita Popov
49d90dcc4d Add Z_EXTRA macro 
For use with u2 values which don't deserve a custom macro...
 2017-01-05 00:49:19 +01:00
Nikita Popov
8d8e949369 Merge branch 'PHP-7.0' into PHP-7.1 2017-01-05 00:28:21 +01:00
Nikita Popov
b47c49d7a0 Merge branch 'PHP-5.6' into PHP-7.0 2017-01-05 00:24:25 +01:00
Nikita Popov
f697874e3f Add tests for delayed __wakeup() 2017-01-05 00:21:48 +01:00
Nikita Popov
0426b916df Implement delayed __wakeup 2017-01-05 00:21:48 +01:00
Joe Watkins
7b436b0c48 Merge branch 'pull-request/2274' into PHP-7.1 
* pull-request/2274:
  Update copyright headers to 2017
 2017-01-04 22:25:45 +00:00
Joe Watkins
125578c636 Merge branch 'pull-request/2273' into PHP-7.0 
* pull-request/2273:
  Update copyright headers to 2017
 2017-01-04 22:24:34 +00:00
Sammy Kaye Powers
1f620efe3c Update copyright header to 2017 in calendar.c 2017-01-04 11:24:25 -06:00
Sammy Kaye Powers
dac6c639bb Update copyright headers to 2017 2017-01-04 11:23:42 -06:00
Sammy Kaye Powers
6550f3ad7e Update copyright header to 2017 in calendar.c 2017-01-04 11:15:47 -06:00
Sammy Kaye Powers
478f119ab9 Update copyright headers to 2017 2017-01-04 11:14:55 -06:00
Anatol Belski
178c7d01f2 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  switch to the beta1 SDK for AppVeyor build
 2017-01-04 17:21:34 +01:00
Anatol Belski
0484c6efe0 switch to the beta1 SDK for AppVeyor build 2017-01-04 15:54:47 +01:00
Joe Watkins
26b7e2e044 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  remove duplicate test
 2017-01-04 14:51:21 +00:00
Joe Watkins
0d09b98ac4 remove duplicate test 2017-01-04 14:50:59 +00:00
Joe Watkins
d514f23573 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix test
 2017-01-04 14:36:37 +00:00