php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-20 22:41:20 +02:00
Code Issues Packages Projects Releases Wiki Activity
92,421 Commits 547 Branches 1,483 Tags
7b787ebbb6fca7340f3f7daa56889a747ff0ecf3
Commit Graph

92421 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrey Hristov
7b787ebbb6 Merge branch 'PHP-5.6' into PHP-7.0 2015-09-30 09:04:00 +02:00
Andrey Hristov
07a8e5ce37 Add JSON as exported type, if available. mysqlnd has it, libmysql doesn't export it (for now). 2015-09-30 09:03:35 +02:00
Xinchen Hui
11baa1b672 Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 2015-09-30 10:41:54 +08:00
Xinchen Hui
45cb42f49f Simply use 0/1 instead as dmitry suggested 2015-09-30 10:41:27 +08:00
Ferenc Kovacs
70e6bf03bf Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  update NEWS, these missed 5.6.14RC1 as I was not asked to include them so delaying for the next release
 2015-09-30 01:35:35 +02:00
Ferenc Kovacs
0c10e10ee8 update NEWS, these missed 5.6.14RC1 as I was not asked to include them so delaying for the next release 2015-09-30 01:28:39 +02:00
Ferenc Kovacs
6d9f12d0b3 add NEWS entries 2015-09-30 01:17:40 +02:00
Ferenc Kovacs
f8ec1d922e Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  add NEWS entries
  add NEWS entries
 2015-09-30 01:17:10 +02:00
Ferenc Kovacs
264f33a23f add NEWS entries 2015-09-30 01:16:43 +02:00
Ferenc Kovacs
62ff2d0bfe Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  add NEWS entries
 2015-09-30 01:15:54 +02:00
Ferenc Kovacs
932f707177 add NEWS entries 2015-09-30 01:15:24 +02:00
Xinchen Hui
df2ff75116 Make ZEND_ECHO and removed ZEND_PRINT distinguishable 2015-09-29 21:50:15 +08:00
Dmitry Stogov
27d4d32e6b Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0 
* 'PHP-7.0' of git.php.net:php-src:
  fix test
  Ensure timeout tests wait for the entire specified duration
 2015-09-29 14:11:39 +03:00
Dmitry Stogov
27a5f66da4 Added information about Zend Extension API chabges 2015-09-29 14:08:03 +03:00
Anatol Belski
bfd2637068 fix test 2015-09-29 13:04:06 +02:00
Steven Hilder
24bb5698af Ensure timeout tests wait for the entire specified duration 2015-09-29 13:04:05 +02:00
Dmitry Stogov
ca36b7bc13 Added zend_internal_function.reserved[] fields, to allow extensions keep additional associated information. 
We didn't have zend_internal_function.reserved[] in PHP5, but we always allocated space for zend_function union, and extensions were able to reuse zend_function.op_array.reserved[] even for internal function. Now this is not possible. And extensions have to use zend_function.op_array.reserved[] for user functions and zend_function.internal_function.reserved[] for internal.
 2015-09-29 13:31:47 +03:00
Anatol Belski
5531d4492e update NEWS for next 2015-09-29 10:51:23 +02:00
marcosptf
dae3ab8e7a Update openssl_x509_checkpurpose.phpt 2015-09-29 10:41:24 +02:00
root
fc3580c9d5 add test to openssl ext 2015-09-29 10:41:22 +02:00
Dmitry Stogov
560e4fa393 Removed or simplified incorrect SEPARATE_*() macros usage. 2015-09-29 11:17:43 +03:00
Andrey Hristov
617bef558b Add upgrading info about the tick functions internal API change 2015-09-29 09:48:49 +02:00
Scott
694b9af5b6 Remove makedev() check. 2015-09-29 09:14:30 +02:00
Scott
46aa628605 Different error message if makedev check fails 2015-09-29 09:14:29 +02:00
Scott
6554f721f7 Add support for getrandom(2), add type check on file descriptor 
Fix to_read, throw exception if syscall fails

Fixes thanks to feedback from sarnold at ##crypto on freenode

Correction on error conditions

Remove dead code (thanks @defuse)

It turns out getrandom can take >256, getentropy refuses.

Better semantics

Thanks @defuse for catching my silly mistake here

Cast to size_t to be explicit

Let's simplify the logic a bit

Let's be consistent; define everything before we do any logic

Continuously check that the file descriptor is still a valid one

Add device type check on fd initialization
 2015-09-29 09:14:28 +02:00
Anatol Belski
208ed0a010 fix test 
cutting out the '/' is not critical, but allows to avoid forking
 2015-09-29 09:11:52 +02:00
Stanislav Malyshev
d6e8426ebf Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Better fix for bug #70433

Conflicts:
	ext/phar/dirstream.c
	ext/phar/util.c
 2015-09-28 21:43:16 -07:00
Stanislav Malyshev
2e267bd3c7 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Better fix for bug #70433

Conflicts:
	ext/phar/dirstream.c
 2015-09-28 21:42:08 -07:00
Stanislav Malyshev
1ddf72180a Better fix for bug #70433 2015-09-28 21:41:02 -07:00
Stanislav Malyshev
4c6f4863fa Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix memory leak
  FIx bug #70433 - Uninitialized pointer in phar_make_dirstream when zip entry filename is "/"

Conflicts:
	ext/phar/dirstream.c
 2015-09-28 20:45:02 -07:00
Stanislav Malyshev
51b23cd0f0 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix memory leak
  FIx bug #70433 - Uninitialized pointer in phar_make_dirstream when zip entry filename is "/"

Conflicts:
	ext/phar/dirstream.c
 2015-09-28 20:44:28 -07:00
Stanislav Malyshev
f98ab19dc0 fix memory leak 2015-09-28 20:43:18 -07:00
Stanislav Malyshev
e78ac461db FIx bug #70433 - Uninitialized pointer in phar_make_dirstream when zip entry filename is "/" 2015-09-28 17:12:35 -07:00
Stanislav Malyshev
e7574a5329 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix bug #69720: Null pointer dereference in phar_get_fp_offset()

Conflicts:
	ext/phar/util.c
 2015-09-28 17:00:32 -07:00
Stanislav Malyshev
f39a4ee0c9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #69720: Null pointer dereference in phar_get_fp_offset()
 2015-09-28 16:59:46 -07:00
Stanislav Malyshev
d698f0ae51 Fix bug #69720: Null pointer dereference in phar_get_fp_offset() 2015-09-28 15:56:51 -07:00
Stanislav Malyshev
899753f240 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix bug #70480 (php_url_parse_ex() buffer overflow read)
 2015-09-28 13:08:44 -07:00
Stanislav Malyshev
629e4da7cc Fix bug #70480 (php_url_parse_ex() buffer overflow read) 2015-09-28 11:31:14 -07:00
Andrey Hristov
be6546fac9 Add support for parameters to tick functions, on C level. This is only 
for extensions that want to use register tick functions. Userland tick
functions are unaffected.
 2015-09-28 11:21:17 +02:00
Bob Weinand
fef88b34e7 Add NEWS entry for #70533 (credits to Anatol) 2015-09-28 01:07:38 +02:00
Anatol Belski
c82e21619e fix phpdbg's -h switch 
The help functionality needs a correct stdout fd, so pre setup it
for the only case.
 2015-09-27 15:46:07 +02:00
Andrey Hristov
7e3cd7cadf Merge branch 'PHP-5.6' into PHP-7.0 2015-09-25 14:29:06 +02:00
Andrey Hristov
59de2c037c Fixed bug #70572 segfault in mysqlnd_connect 2015-09-25 14:06:28 +02:00
Andrey Hristov
85be6fe96b Spread the news about 70384 2015-09-25 13:54:10 +02:00
Dmitry Stogov
7e797f1302 Allow an experimental VM with tail call dispatch technique (disabled by default). 
This VM may work only if all tail calls are optimized, otherwaise it will crach because of stack overflow.
Unfortunately, we can't guarantee tail call optimization in C.
 2015-09-25 12:54:51 +03:00
Anatol Belski
37c85ebb94 check for test requirement 2015-09-25 11:50:15 +02:00
Anatol Belski
c75346624a fix data type and warning 2015-09-25 11:50:13 +02:00
Dmitry Stogov
a05fc48055 Extended zend_extension API to allow storing additional data associated with op_arrays in opcache SHM. (op_array->reserved[]) 2015-09-25 11:50:38 +03:00
Dmitry Stogov
f509706318 Make necessary separation (it might be possible to fix this in a better way, but this will requre some refactoring) 2015-09-25 10:59:27 +03:00
Anatol Belski
b98d09a6a9 add note about minimum openssl version 2015-09-25 09:11:33 +02:00