clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-30 06:16:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
99,477 Commits 494 Branches 1,367 Tags 792 MiB
3b741353e1
Commit Graph

99477 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Joe Watkins
b39310c715
fix test 2017-01-04 14:36:18 +00:00
Joe Watkins
6c9164047e
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  get_defined_functions additional parameter to exclude disabled functions
  news entry for PR #1312
 2017-01-04 13:36:04 +00:00
Joe Watkins
63d116e571
Merge branch 'pull-request/1312' into PHP-7.0 
* pull-request/1312:
  get_defined_functions extra parameter to exclude disabled functions
  news entry for PR #1312
 2017-01-04 13:34:31 +00:00
Anatol Belski
b15cc7913a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix PDO tests to match SQL standard syntax and pass Firebird tests.
 2017-01-03 17:54:46 +01:00
Dorin Marcoci
e914abff1e Fix PDO tests to match SQL standard syntax and pass Firebird tests. 2017-01-03 17:48:52 +01:00
Anatol Belski
63d980b3c7 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  better skip on files
 2017-01-03 13:27:06 +01:00
Anatol Belski
3a1ae7bb9b better skip on files 
some more could be added
 2017-01-03 13:25:16 +01:00
Nikita Popov
661fad7beb Merge branch 'PHP-7.0' into PHP-7.1 2017-01-03 12:18:33 +01:00
Nikita Popov
b3889d4b20 Fix build 2017-01-03 12:16:35 +01:00
Vince
cfd6e14842 Fix Bug #73462 - Persistent connections don't set $connect_errno 
Persistent connections skipped resetting $connect_error and $connect_errno values
This adds the "clear error" line to persistent connections for consistency
 2017-01-03 12:13:08 +01:00
Joe Watkins
ff4e330eae
Merge branch 'pull-request/1905' 
* pull-request/1905:
   pack()/unpack() for Big Endian float/double and Little Endian float/double
 2017-01-03 10:50:19 +00:00
Joe Watkins
e42a01bcd5
Merge branch 'pull-request/1905' 
* pull-request/1905:
   pack()/unpack() for Big Endian float/double and Little Endian float/double
 2017-01-03 10:49:53 +00:00
Rasmus Lerdorf
19b757dacd Fix opcache test dependencies 2017-01-02 22:30:28 -08:00
Rasmus Lerdorf
608724bfe1 Fix opcache test dependencies 2017-01-02 22:21:12 -08:00
Stanislav Malyshev
b9837dc183 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Use correct string release function
 2017-01-02 22:08:42 -08:00
Stanislav Malyshev
68ac602b28 Use correct string release function 2017-01-02 22:08:25 -08:00
Stanislav Malyshev
0f0406a1c9 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix error reporting
 2017-01-02 21:59:59 -08:00
Stanislav Malyshev
ea6e54aff3 Fix error reporting 2017-01-02 21:59:44 -08:00
Stanislav Malyshev
ca72faa2c5 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix #73832 - leave the table in a safe state if the size is too big.
  Fix bug #73831 - NULL Pointer Dereference while unserialize php object
 2017-01-02 21:37:06 -08:00
Stanislav Malyshev
a6cdefe043 Merge branch 'PHP-7.0.15' into PHP-7.0 
* PHP-7.0.15:
  Fix #73832 - leave the table in a safe state if the size is too big.
  Fix bug #73831 - NULL Pointer Dereference while unserialize php object
 2017-01-02 21:35:42 -08:00
Stanislav Malyshev
2075fb2b73 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #73737 FPE when parsing a tag format
  Fix bug #73773 - Seg fault when loading hostile phar
  Fix bug #73825 - Heap out of bounds read on unserialize in finish_nested_data()
  Fix bug #73768 - Memory corruption when loading hostile phar
  Fix int overflows in phar (bug #73764)
 2017-01-02 21:07:01 -08:00