clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-04 00:06:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
81,748 Commits 494 Branches 1,367 Tags 814 MiB
46117aff49
Commit Graph

81748 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bob Weinand
3c2b42ac41 Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	Zend/zend_compile.c
 2014-06-16 11:18:45 +02:00
Bob Weinand
e93f8e74d4 Merge branch 'PHP-5.4' into PHP-5.5 2014-06-16 11:16:33 +02:00
Bob Weinand
0a3979e08b Fix patch for bug #67436 2014-06-16 11:10:50 +02:00
Dmitry Stogov
3b2fb7abc5 Fixed support for references 2014-06-16 13:08:48 +04:00
Remi Collet
ced7f0ea12 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix failed test
 2014-06-16 10:52:39 +02:00
Remi Collet
6788f14f5e fix failed test 2014-06-16 10:52:26 +02:00
Remi Collet
6b9fa109e0 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix test on modern distro where old unsecure algo are disabled in openssl config. Testing recent algo should be enough to check this function.
 2014-06-16 09:44:58 +02:00
Remi Collet
fc36277eb6 Fix test on modern distro where old unsecure algo are disabled in openssl config. 
Testing recent algo should be enough to check this function.
 2014-06-16 09:42:55 +02:00
Xinchen Hui
17b98b6379 Refactoring imap (in progress) 2014-06-16 14:59:03 +08:00
Bob Weinand
8668f205ca Merge branch 'PHP-5.6' 2014-06-16 00:43:31 +02:00
Bob Weinand
7cef3a57ad Merge branch 'PHP-5.5' into PHP-5.6 2014-06-16 00:42:50 +02:00
Bob Weinand
03ee0ddc5f Merge branch 'PHP-5.4' into PHP-5.5 2014-06-16 00:41:46 +02:00
Bob Weinand
4053dbe29f Merge branch 'pull-request/695' into PHP-5.4 2014-06-16 00:35:20 +02:00
Levi Morrison
6c9c44905e Added tests for bug 67436 2014-06-15 16:31:39 -06:00
Bob Weinand
02bea01f3d Merge branch 'PHP-5.6' 2014-06-15 23:56:14 +02:00
Bob Weinand
0913c15092 Merge branch 'PHP-5.5' into PHP-5.6 2014-06-15 23:55:44 +02:00
Bob Weinand
4555779c39 Merge branch 'PHP-5.4' into PHP-5.5 2014-06-15 23:54:05 +02:00
Bob Weinand
a84a2d4ace Fixed wrong XFAIL test - already fixed 2014-06-15 23:52:41 +02:00
Lior Kaplan
2c327599a3 Fix typo in Bug #67406 NEWS entry 2014-06-16 00:33:09 +03:00
Lior Kaplan
d9432d6a50 Fix typo in Bug #67406 NEWS entry 2014-06-16 00:26:01 +03:00
Bob Weinand
143cc3f0da Merge branch 'PHP-5.6' 2014-06-15 23:16:21 +02:00
Bob Weinand
f92143f740 Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	NEWS
	Zend/zend_compile.c
 2014-06-15 23:06:15 +02:00
Bob Weinand
1d802ad5e5 Merge branch 'PHP-5.4' into PHP-5.5 2014-06-15 22:36:13 +02:00
Bob Weinand
85d3ac5763 Updated NEWS 2014-06-15 22:32:47 +02:00
Bob Weinand
f5f1c702cd Merge branch 'PHP-5.4' into PHP-5.5 2014-06-15 22:24:44 +02:00
Bob Weinand
ca29063da5 Fix bug #67436 2014-06-15 22:18:25 +02:00
Bob Weinand
05d7facb40 Update NEWS 2014-06-15 15:50:36 +02:00
Bob Weinand
1d71600394 Merge branch 'PHP-5.6' 2014-06-15 15:47:44 +02:00
Bob Weinand
f677889a9a Merge sapi/phpdbg into PHP-5.6 2014-06-15 15:47:14 +02:00
Stanislav Malyshev
693535084d Merge branch 'PHP-5.6' 
* PHP-5.6:
  update NEWS
  update NEWS
  update NEWS
 2014-06-15 01:08:16 -07:00
Stanislav Malyshev
da3ef175b9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update NEWS
  update NEWS
 2014-06-15 01:07:48 -07:00
Stanislav Malyshev
b303f19cff update NEWS 2014-06-15 01:07:39 -07:00
Stanislav Malyshev
b2b3ce717f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  update NEWS
 2014-06-15 01:06:46 -07:00
Stanislav Malyshev
55c2721229 update NEWS 2014-06-15 01:06:37 -07:00
Stanislav Malyshev
b053c4f4f6 update NEWS 2014-06-15 00:46:31 -07:00
kovacs.ferenc
e9c2e7d6e6 fix bugsnet #67212: phpdbg uses non-standard TIOCGWINSZ 2014-06-14 23:48:24 +02:00
kovacs.ferenc
fbb7bdc21e change the default terminal width from 100 to 80, as that is the most common value 2014-06-14 23:48:24 +02:00
Derick Rethans
b1a708b28c Merge branch 'PHP-5.6' 2014-06-13 23:26:50 +01:00
Derick Rethans
a06dabb5e9 Merge branch 'PHP-5.5' into PHP-5.6 2014-06-13 23:26:47 +01:00
Derick Rethans
c06ccf7c70 Merge branch 'PHP-5.4' into PHP-5.5 2014-06-13 23:26:43 +01:00
Derick Rethans
ce70b920e4 - Updated to version 2014.5 (2014e) 2014-06-13 23:26:42 +01:00
Matteo Beccati
7d2bcbe20c Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #67433 SIGSEGV when using count() on an object implementing Countable
 2014-06-13 13:14:52 +02:00
Matteo Beccati
df5551ba4f Fix bug #67433 SIGSEGV when using count() on an object implementing Countable 2014-06-13 13:14:12 +02:00
krakjoe
ab353c0a55 remove all references 2014-06-13 07:35:11 +01:00
Adam Harvey
64f85d5afa Merge branch 'PHP-5.6' 
* PHP-5.6:
  Follow 308 Permanent Redirect responses.
 2014-06-12 18:19:11 -07:00
Adam Harvey
84f339546a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Follow 308 Permanent Redirect responses.
 2014-06-12 18:17:18 -07:00
Adam Harvey
2546434008 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Follow 308 Permanent Redirect responses.
 2014-06-12 18:15:07 -07:00
Adam Harvey
b51f82f260 Follow 308 Permanent Redirect responses. 
Fixes bug #67430 (http:// wrapper doesn't follow 308 redirects).
 2014-06-12 18:12:53 -07:00
Adam Harvey
dd57ceb1de Merge branch 'PHP-5.6' 
* PHP-5.6:
  Add 308 and 426 to the HTTP response code map in the CLI server.
 2014-06-12 17:57:55 -07:00
Adam Harvey
e082199d8e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add 308 and 426 to the HTTP response code map in the CLI server.
 2014-06-12 17:57:36 -07:00