php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-04 14:42:49 +02:00
Code Issues Packages Projects Releases Wiki Activity
81,131 Commits 547 Branches 1,481 Tags
21da246807274df4ab04ca666a1069f4e1539a3b
Commit Graph

81131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
21da246807 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  move the test to the right place
 2014-12-10 13:22:52 +01:00
Anatol Belski
c5f7dcd1dc move the test to the right place 2014-12-10 13:19:51 +01:00
Anatol Belski
a96957f0da updated NEWS 2014-12-10 11:49:13 +01:00
Anatol Belski
4a82cdce66 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #68545 NULL pointer dereference in unserialize.c

Conflicts:
	ext/standard/var_unserializer.c
 2014-12-10 11:47:34 +01:00
Anatol Belski
20d93534d5 Fixed bug #68545 NULL pointer dereference in unserialize.c 2014-12-10 11:43:33 +01:00
Julien Pauli
e6f9059a86 Updated NEWS 2014-12-10 11:23:40 +01:00
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
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
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
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
Anatol Belski
41a2f7074d Fixed bug #68398 msooxml matches too many archives 2014-12-06 20:51:00 +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
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
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
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
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
Julien Pauli
0e67973e9a Updated NEWS 2014-12-05 17:06:16 +01:00
Julien Pauli
5104c2bbc3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Updated NEWS
  Start adding new attribute to control multi statements
 2014-12-05 17:05:37 +01:00
Julien Pauli
3add3491b3 Updated NEWS 2014-12-05 17:05:21 +01:00
pwolanin
4c0bd5e77a Start adding new attribute to control multi statements 2014-12-05 17:03:31 +01:00
Anatol Belski
a3e4b889e7 updated NEWS 2014-12-05 15:51:26 +01:00
Anatol Belski
297f582f5c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  . Fixed bug #68120 Update bundled libsqlite

Conflicts:
	ext/sqlite3/libsqlite/sqlite3.c
 2014-12-05 15:50:18 +01:00
Anatol Belski
fccd1eda5f . Fixed bug #68120 Update bundled libsqlite 2014-12-05 15:43:53 +01:00
Anatol Belski
0e09e5e6fa Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #65769 localeconv() broken in TS builds
 2014-12-05 11:08:55 +01:00
Anatol Belski
fa863c9ea3 updated NEWS 2014-12-05 11:08:32 +01:00
Anatol Belski
7943f944c2 Fixed bug #65769 localeconv() broken in TS builds 2014-12-05 11:06:06 +01:00
Julien Pauli
cb9cc6b8e1 Updated NEWS 2014-12-05 10:12:35 +01:00
Julien Pauli
ee709c5366 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Updated NEWS
  Fixed #68479 - Added escape parameter to SplFileObject::fputcsv
 2014-12-05 10:12:08 +01:00
Julien Pauli
1e40b0aff6 Updated NEWS 2014-12-05 10:11:49 +01:00
Peter Cowburn
557026301f Fixed #68479 - Added escape parameter to SplFileObject::fputcsv 2014-12-05 10:10:10 +01:00
Anatol Belski
6cf5ac7567 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix dir separators in test
 2014-12-05 07:08:35 +01:00
Anatol Belski
c65143d571 fix dir separators in test 2014-12-05 07:07:58 +01:00
Ferenc Kovacs
9c5d84ace1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  add initial install
  switch to C travis project instead of PHP
  use the generic TRAVIS environment var to check for travis (see http://docs.travis-ci.com/user/ci-environment/)
 2014-12-04 11:12:32 +01:00
Ferenc Kovacs
4f9f7c7948 Merge branch 'pull-request/932' into PHP-5.5 
* pull-request/932:
  add initial install
  switch to C travis project instead of PHP
  use the generic TRAVIS environment var to check for travis (see http://docs.travis-ci.com/user/ci-environment/)
 2014-12-04 11:12:17 +01:00
Tjerk Meesters
52b41f24e3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed #65213 - cannot cast SplFileInfo to boolean
 2014-12-04 07:21:13 +08:00
Tjerk Meesters
2bcf8a6cd9 Fixed #65213 - cannot cast SplFileInfo to boolean 2014-12-04 07:17:33 +08:00