clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-25 03:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
86,906 Commits 493 Branches 1,366 Tags 848 MiB
f62ad3bc57
Commit Graph

86906 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julien Pauli
9a1fc445bf Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Updated NEWS
 2014-12-10 11:22:46 +01:00
Julien Pauli
a67a5dc0ad Updated NEWS 2014-12-10 11:22:28 +01:00
Remi Collet
19d481945e Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  Fix bug #68526 Implement POSIX Access Control List for UDS
 2014-12-10 08:19:29 +01:00
Remi Collet
eda813fd37 NEWS 2014-12-10 08:19:04 +01:00
Remi Collet
744ada7d9d Fix bug #68526 Implement POSIX Access Control List for UDS 
- add --with-fpm-acl build option which allow to manage ACL
on Unix Domain Socket
- add listen.acl_users pool option
- add listen.acl_groups pool option

Keep old behavior (chmod) if option not used or not supported.
 2014-12-10 08:15:21 +01:00
Dmitry Stogov
2f3c79b4bf Improved basic zval copying primitives: ZVAL_COPY_VALUE(), ZVAL_COPY(), ZVAL_DUP() 2014-12-09 18:07:39 +03:00
Dmitry Stogov
29b9105beb Wrap RETURN_VALUE_USED() with EXPECTED() or UNEXPECTED() macros according to more frequent usage patterns. 2014-12-09 17:07:12 +03:00
Dmitry Stogov
5b3a69c29f Improved ASSIGN_<OP>, ASSIGN_DIM and UNSET_DIM 2014-12-09 15:15:24 +03:00
Remi Collet
f0f51da936 drop dead/unused code 2014-12-09 11:25:53 +01:00
Dmitry Stogov
98e81e13cf simplified code 2014-12-09 12:17:55 +03:00
Dmitry Stogov
0b19a7c235 Move ZVAL_DEREF() and make_real_object() into slow paths. 2014-12-09 03:05:06 +03:00
Dmitry Stogov
f70545678b Pass znode_op structure by value (it fits into one word) instead of pointer to structure. 2014-12-09 03:03:38 +03:00
Dmitry Stogov
11f7854e75 Move checks for references into slow paths. 2014-12-09 01:09:44 +03:00
Dmitry Stogov
b6c6e7960a Improved ASSIGN_DIM and ASSIGN_OBJ 2014-12-09 00:10:23 +03:00
Dmitry Stogov
0bfc9c6979 Fixed typo 2014-12-08 18:40:37 +03:00
Dmitry Stogov
db4271d332 Move checks for references into slow paths of handlers or helpers. Remove duplicate opcode handlers. 2014-12-08 18:11:14 +03:00
Derick Rethans
eb6fb71e55 Merge branch 'PHP-5.6' 2014-12-08 11:07:00 +00:00
Derick Rethans
9d4f4483cb Merge branch 'PHP-5.5' into PHP-5.6 2014-12-08 11:06:50 +00:00
Derick Rethans
4078c35939 Merge branch 'day-of-week-issues' into PHP-5.5 2014-12-08 11:06:41 +00:00
Derick Rethans
5f9a68d3ef Fixed day_of_week function as it could sometimes return negative values internally. 2014-12-08 11:06:12 +00:00
Dmitry Stogov
70a2748b5e Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed possible read after end of buffer and use after free.
 2014-12-08 12:25:52 +03:00
Dmitry Stogov
278c38165c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed possible read after end of buffer and use after free.
 2014-12-08 12:24:16 +03:00
Dmitry Stogov
e6ad29ae96 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed possible read after end of buffer and use after free.
 2014-12-08 12:20:01 +03:00
Dmitry Stogov
dd791cd717 Fixed possible read after end of buffer and use after free. 2014-12-08 12:18:27 +03:00
Nikita Popov
c6d0c55a23 Fix arrow operator precedence 
I accidentially added => as the highest-precedence operator...
 2014-12-07 23:00:48 +01:00
Anatol Belski
ba35b22bc4 Merge remote-tracking branch 'origin/master' into native-tls 
* origin/master: (35 commits)
  Fixed bug #68398 msooxml matches too many archives
  Fix zpp call in apache_getenv()
  Drop unnecessary zval containers
  fixed test
  C89 compat
  add include for missing localeconv_r proto
  updated NEWS
  Fixed bug #65230 setting locale randomly broken
  Fix compilation error (ref #68424)
  Removed useless handlers
  Move checks for references into slow paths of operator functions. Remove duplicate opcode handlers.
  Revert unintentional docblock change
  Restored zip/oci8 PHP 4 code, add PHP 7 checks
  Note macro removal in UPGRADING.INTERNALS
  Removed ZEND_ENGINE_2 checks (and ZE1 code, it's been a decade!)
  Zend Engine 3
  Updated NEWS
  Updated NEWS
  Updated NEWS
  Start adding new attribute to control multi statements
  ...
 2014-12-06 21:37:15 +01:00
Anatol Belski
aa52fcf179 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #68398 msooxml matches too many archives
 2014-12-06 20:51:41 +01:00
Anatol Belski
41a2f7074d Fixed bug #68398 msooxml matches too many archives 2014-12-06 20:51:00 +01:00
Nikita Popov
7be91dd730 Fix zpp call in apache_getenv() 2014-12-06 12:38:56 +01:00
Nikita Popov
204e3f8d5a Drop unnecessary zval containers 2014-12-06 12:38:56 +01:00
Anatol Belski
51bae8805d Merge branch 'PHP-5.6' 
* PHP-5.6:
  fixed test
 2014-12-06 12:32:16 +01:00
Anatol Belski
0854fd8b81 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fixed test
 2014-12-06 12:31:55 +01:00
Anatol Belski
5d126245a3 fixed test 2014-12-06 12:31:27 +01:00
Anatol Belski
42d7cb4c2c Merge branch 'PHP-5.6' 
* PHP-5.6:
  C89 compat
  add include for missing localeconv_r proto
 2014-12-06 12:18:36 +01:00
Anatol Belski
08241ee3f3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  C89 compat
  add include for missing localeconv_r proto
 2014-12-06 12:18:05 +01:00
Anatol Belski
9016018ccc C89 compat 2014-12-06 12:14:17 +01:00
Anatol Belski
373aa7c81f add include for missing localeconv_r proto 2014-12-06 12:09:35 +01:00
Anatol Belski
3d68d843cb Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  Fixed bug #65230 setting locale randomly broken
 2014-12-06 12:01:09 +01:00
Anatol Belski
8d79139980 updated NEWS 2014-12-06 12:00:39 +01:00
Anatol Belski
ebaf130a15 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #65230 setting locale randomly broken
 2014-12-06 12:00:17 +01:00
Anatol Belski
1b4d5ad46a Fixed bug #65230 setting locale randomly broken 2014-12-06 11:59:43 +01:00
Matteo Beccati
0d76e16504 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix compilation error (ref #68424)
 2014-12-06 10:24:56 +01:00
Matteo Beccati
b120f9beb2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix compilation error (ref #68424)
 2014-12-06 10:24:27 +01:00
Matteo Beccati
625b929c6e Fix compilation error (ref #68424) 2014-12-06 10:23:56 +01:00
Dmitry Stogov
a555bdf7d1 Removed useless handlers 2014-12-06 03:03:48 +03:00
Dmitry Stogov
5ba4ae7f67 Move checks for references into slow paths of operator functions. Remove duplicate opcode handlers. 2014-12-06 02:14:45 +03:00
Adam Harvey
751aa92fe5 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Revert unintentional docblock change
 2014-12-05 13:58:48 -08:00
Adam Harvey
381fd62ccf Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Revert unintentional docblock change
 2014-12-05 13:58:19 -08:00
Adam Harvey
79131b4617 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Revert unintentional docblock change
 2014-12-05 13:57:46 -08:00
Chris Christoff
0e985d3726 Revert unintentional docblock change 
Revert unintentional docblock change

It looks like commit dd8e59da8f
introduced an unintended docbloc change. I have reverted this
change in this commit.
 2014-12-05 13:57:03 -08:00