archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 06:58:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
96632 commits 526 branches 1434 tags 873 MiB
Commit graph

96632 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nikita Popov
45cfe7852a Merge branch 'PHP-7.0' 
Conflicts:
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
 2016-06-28 20:57:55 +02:00
Nikita Popov
fafe01b07b Make call_user_func() on reference args consistent 
Previously reference arguments were allowed if call_user_func()
was compiled to SEND_USER and not otherwise. Make it consistent
by always forbidding them.
 2016-06-28 20:43:38 +02:00
Nikita Popov
2710ce22a0 Remove assert for now 2016-06-28 18:47:29 +02:00
Nikita Popov
cb7cc16c2d Use DO_UCALL for method calls 2016-06-28 12:05:03 +02:00
Nikita Popov
cdd58edf42 More type inferences fixes 2016-06-28 11:49:50 +02:00
Dmitry Stogov
0cfb47651c Fixed compilation warnings 2016-06-28 11:37:51 +03:00
Stanislav Malyshev
0ac5144836 Fix bug #72099: xml_parse_into_struct segmentation fault 2016-06-28 01:23:24 -07:00
Xinchen Hui
b8a9e98166 Fixed build 2016-06-28 15:54:20 +08:00
Xinchen Hui
791d16834c Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed test
 2016-06-28 15:39:10 +08:00
Xinchen Hui
76370f30db Fixed test 2016-06-28 15:39:02 +08:00
Xinchen Hui
63a5b1994b Update NEWS 2016-06-28 15:37:33 +08:00
Xinchen Hui
3a4b8f6719 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72508 (strange references after recursive function call and "switch" statement)
 2016-06-28 15:36:58 +08:00
Xinchen Hui
ce7e180a04 Fixed bug #72508 (strange references after recursive function call and "switch" statement) 2016-06-28 15:36:50 +08:00
Xinchen Hui
e9143d5ab2 Merge branch 'PHP-7.0' 
* PHP-7.0:
  MFH: Fixed fd leak (the origin commit can not be cherry-picked)

Conflicts:
	main/fastcgi.c
	sapi/cli/ps_title.c
 2016-06-28 11:37:20 +08:00
Xinchen Hui
de7a6b1232 MFH: Fixed fd leak (the origin commit can not be cherry-picked) 2016-06-28 11:36:27 +08:00
Xinchen Hui
7d729d9cc0 Merge branch 'master' of https://github.com/devnexen/php-src 
* 'master' of https://github.com/devnexen/php-src:
  couple of resource leaks fixes and use after free's
 2016-06-28 11:29:31 +08:00
Xinchen Hui
7b6235ee05 Updated NEWS 2016-06-28 11:12:22 +08:00
Xinchen Hui
4fb5885bf8 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72505 (readfile() mangles files larger than 2G)
 2016-06-28 11:12:01 +08:00
Xinchen Hui
86732b4ea0 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 the fix for #72403 on nl2br
  Update NEWS
  Update NEWS
  Fix #70628: Clearing bindings on an SQLite3 statement doesn't work
  5.5.38 now
 2016-06-28 11:11:39 +08:00
Xinchen Hui
c73a2f7f45 Fixed bug #72505 (readfile() mangles files larger than 2G) 2016-06-28 11:11:25 +08:00
Davey Shafik
ae8cf3cb54 Update NEWS 2016-06-27 14:23:00 -07:00
Davey Shafik
32454700eb Merge support for HTTP/2 Server Push in ext/curl 2016-06-27 13:34:37 -07:00
Stanislav Malyshev
0eb630db16 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fix the fix for #72403 on nl2br
  5.5.38 now
 2016-06-27 12:33:53 -07:00
Stanislav Malyshev
ec82c6b4e1 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix the fix for #72403 on nl2br
  5.5.38 now

Conflicts:
	ext/standard/string.c
 2016-06-27 12:32:58 -07:00
Stanislav Malyshev
b8487b6a7d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix the fix for #72403 on nl2br
  5.5.38 now

Conflicts:
	configure.in
	main/php_version.h
 2016-06-27 12:32:11 -07:00
Stanislav Malyshev
25bd11cf27 Fix the fix for #72403 on nl2br 2016-06-27 12:30:42 -07:00
Jakub Zelenka
947257b79e Merge branch 'precise_float' 2016-06-27 19:40:44 +01:00
Jakub Zelenka
341b35114e Update NEWS and UPGRADING 2016-06-27 19:40:17 +01:00
Christoph M. Becker
62f366e056 Update NEWS 2016-06-27 17:25:06 +02:00
Christoph M. Becker
0d0f5976d8 Merge branch 'PHP-7.0' 2016-06-27 17:18:44 +02:00
Christoph M. Becker
b5fc4dbf21 Update NEWS 2016-06-27 17:17:34 +02:00
Christoph M. Becker
0f03224d59 Merge branch 'PHP-5.6' into PHP-7.0 2016-06-27 17:09:55 +02:00
Christoph M. Becker
1314db7109 Update NEWS 2016-06-27 17:07:26 +02:00
Christoph M. Becker
57940605da Fix #70628: Clearing bindings on an SQLite3 statement doesn't work 
Obiously, it isn't sufficient to call sqlite3_clear_bindings() alone, but
also the bound_params of the php_sqlite3_stmt have to be cleared.
 2016-06-27 17:06:27 +02:00
David Carlier
d0217e0022 Merge branch 'master' of https://github.com/php/php-src 2016-06-27 11:49:57 +01:00
Davey Shafik
ad15e1ccda Implement curl server push 2016-06-27 01:17:32 -07:00
Davey Shafik
d56d2f452b Refactor easy handle lookup 2016-06-27 00:52:46 -07:00
Davey Shafik
63275a1e58 Refactor setup of handlers on copied curl handles 2016-06-27 00:52:46 -07:00
Dmitry Stogov
044e2718fe Fixed executor without global register variales (gcc warnings or clang errors) 2016-06-27 10:36:41 +03:00
David Carlier
ca91509957 Merge branch 'master' of https://github.com/php/php-src 2016-06-27 07:45:27 +01:00
David Carlier
85e985f191 couple of resource leaks fixes and use after free's 2016-06-27 07:44:21 +01:00
Pierrick Charron
e53982320b Update NEWS 2016-06-26 13:36:44 -04:00
Pierrick Charron
3d71c1de7a Add curl_multi/share_errno() curl_share_strerror() 
Add 3 new functions :
- curl_multi_errno()
- curl_share_errno()
- curl_share_strerror()

https://wiki.php.net/rfc/new-curl-error-functions
 2016-06-26 13:29:42 -04:00
Jakub Zelenka
f7281ce483 Merge branch 'openssl_ecc_keypair' 2016-06-26 17:29:29 +01:00
Jakub Zelenka
f05736b37c Update NEWS with ECC curve support info 2016-06-26 17:29:02 +01:00
Jakub Zelenka
e8a09ddc07 Improve openssl ecc keypair support implementation 2016-06-26 16:55:51 +01:00
Dominic Luechinger
9688138d38 Adds initial support to generate and work with ECC public key pair 
New features:
- openssl_get_curve_names => list ECC curve names
- generate a ECC public key pair
- generate an CSR with an ECC key
- export x,y,d params of ECC public/private key

Thanks to @bukka for the review and feedback
 2016-06-26 16:15:25 +01:00
Jakub Zelenka
3f13507dd2 Use one place to define max length of double 
Introduce new constant PHP_DOUBLE_MAX_LENGTH for that purpose
 2016-06-26 14:03:01 +01:00
Jakub Zelenka
158b537c99 Change default for serialize_precision to -1 (use mode 0) 2016-06-26 13:41:22 +01:00
Jakub Zelenka
71774c241e Add decimal point in double serialization 2016-06-26 13:26:43 +01:00