clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 06:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
80,139 Commits 494 Branches 1,367 Tags 800 MiB
e8e907279e
Commit Graph

80139 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bob Weinand
003ba74d99 Merge sapi/phpdbg into PHP-5.6 2014-05-03 11:40:25 +02:00
krakjoe
c8d8e851fa /me blushes, really hard 2014-05-03 10:37:11 +01:00
Ferenc Kovacs
a6a1785e23 Merge branch 'PHP-5.5' 
* PHP-5.5:
  only build and test nts non-debug and ts debug builds as discussed at https://github.com/php/php-src/pull/654
 2014-05-03 02:51:46 +02:00
Ferenc Kovacs
c29a72d17f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  only build and test nts non-debug and ts debug builds as discussed at https://github.com/php/php-src/pull/654
 2014-05-03 02:51:02 +02:00
Ferenc Kovacs
58f4bf441a only build and test nts non-debug and ts debug builds as discussed at https://github.com/php/php-src/pull/654 2014-05-03 02:50:37 +02:00
Adam Harvey
2f1148ae8a Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix mysqli build when building against libmysqlclient.
 2014-05-02 14:34:48 -07:00
Adam Harvey
06a03bbfa6 Fix mysqli build when building against libmysqlclient. 2014-05-02 14:33:52 -07:00
Adam Harvey
62d72d9105 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix author name on the #63228 patch.
 2014-05-02 10:26:18 -07:00
Adam Harvey
fbb0c4b800 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix author name on the #63228 patch.
 2014-05-02 10:25:42 -07:00
Adam Harvey
d8ff8f6f20 Fix author name on the #63228 patch. 2014-05-02 10:24:09 -07:00
Adam Harvey
f7cb87f333 Fix author name on the #63228 patch. 2014-05-02 10:23:09 -07:00
Nikita Popov
46bcaf1b28 Merge branch 'PHP-5.6' 2014-05-02 12:52:44 +02:00
Nikita Popov
69b5ee61d0 Fixed bug #67169: []= after_array_splice incorrect 
This fixes a regression I introduced in beta 1.
 2014-05-02 12:49:51 +02:00
Ferenc Kovacs
db3b70673f Merge branch 'PHP-5.6' 
* PHP-5.6:
  Revert "show leaks in their own group" using valgrind would be a bit too much for travis I guess.
 2014-05-02 09:50:40 +02:00
Ferenc Kovacs
cc2e89d4e1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Revert "show leaks in their own group" using valgrind would be a bit too much for travis I guess.
 2014-05-02 09:50:25 +02:00
Ferenc Kovacs
192b35382a Revert "show leaks in their own group" 
using valgrind would be a bit too much for travis I guess.

This reverts commit ea60d79e23.
 2014-05-02 09:49:10 +02:00
Ferenc Kovacs
3ca7bc089b Merge branch 'PHP-5.6' 
* PHP-5.6:
  show leaks in their own group
 2014-05-02 09:33:31 +02:00
Ferenc Kovacs
a7437db776 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  show leaks in their own group
 2014-05-02 09:33:08 +02:00
Ferenc Kovacs
ea60d79e23 show leaks in their own group 2014-05-02 09:32:42 +02:00
Adam Harvey
aacc49191c Merge branch 'PHP-5.6' 
* PHP-5.6:
  Use the right path for the suggested PHP invocation in ext_skel.
  Changed to more understandable NEWS message
  one heading is enough
 2014-05-01 11:23:48 -07:00
Adam Harvey
d5712d6ba4 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Use the right path for the suggested PHP invocation in ext_skel.
 2014-05-01 11:23:14 -07:00
Adam Harvey
eb46096608 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Use the right path for the suggested PHP invocation in ext_skel.
 2014-05-01 11:22:46 -07:00
Adam Harvey
941c39bd06 Use the right path for the suggested PHP invocation in ext_skel. 
Fixes bug #67160 (ext_skel outputs incorrect information).
 2014-05-01 11:22:20 -07:00
Bob Weinand
f99449c309 Changed to more understandable NEWS message 2014-05-01 17:10:00 +02:00
Ferenc Kovacs
0a73853798 one heading is enough 2014-05-01 16:38:06 +02:00
Ferenc Kovacs
f8f5d311cb Merge branch 'PHP-5.6' 
* PHP-5.6:
  add new NEWS block for alpha3
 2014-05-01 16:25:38 +02:00
Ferenc Kovacs
75640d0d85 add new NEWS block for alpha3 2014-05-01 16:24:49 +02:00
Ferenc Kovacs
562a845dcc Merge branch 'PHP-5.6' 
* PHP-5.6:
  XFAIL the leaking multibyte tests, we should really get to the bottom of this
 2014-05-01 12:50:28 +02:00
Ferenc Kovacs
95325e5c5d XFAIL the leaking multibyte tests, we should really get to the bottom of this 2014-05-01 12:49:57 +02:00
Bob Weinand
e0b9e5249c Merge branch 'PHP-5.6' 2014-05-01 12:30:46 +02:00
Bob Weinand
d27b76a779 Fixed numbering in UPGRADING file 2014-05-01 12:27:38 +02:00
Bob Weinand
3695bf27f8 Merge branch 'PHP-5.6' 2014-05-01 11:47:28 +02:00
Bob Weinand
5d13b7f191 Updated NEWS for fixed phpdbg issue #85 2014-05-01 11:46:35 +02:00
Bob Weinand
3ad8616aff Added stdion/stdout/stderr constsnts and their php:// wrappers 
Fixes issue #85
 2014-05-01 11:43:46 +02:00
Bob Weinand
191e3a0210 Merge sapi/phpdbg 2014-05-01 11:41:49 +02:00
Bob Weinand
bcf85252e2 Added stdion/stdout/stderr constsnts and their php:// wrappers 
Fixes issue #85
 2014-05-01 11:38:08 +02:00
Ferenc Kovacs
94f279258d Merge branch 'PHP-5.6' 
* PHP-5.6:
  add missing NEWS entry to the correct release where it was added
  5.5.12 was released yesterday
  add missing NEWS entry to the correct release where it was added
  add missing NEWS entry to the correct release where it was added
 2014-05-01 10:57:12 +02:00
Ferenc Kovacs
a67d4d33c2 add missing NEWS entry to the correct release where it was added 2014-05-01 10:56:39 +02:00
Ferenc Kovacs
3da5ef47ca Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  5.5.12 was released yesterday
  add missing NEWS entry to the correct release where it was added
  add missing NEWS entry to the correct release where it was added
 2014-05-01 10:56:21 +02:00
Ferenc Kovacs
0842200501 5.5.12 was released yesterday 2014-05-01 10:54:15 +02:00
Ferenc Kovacs
b14b8dfc10 add missing NEWS entry to the correct release where it was added 2014-05-01 10:52:24 +02:00
Ferenc Kovacs
ef7821506a Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  add missing NEWS entry to the correct release where it was added
 2014-05-01 10:52:13 +02:00
Bob Weinand
ae8010a0f4 Merge branch 'PHP-5.6' 2014-05-01 10:51:45 +02:00
Bob Weinand
5ba657ce89 Updated NEWS entry for phpdbg 2014-05-01 10:50:41 +02:00
Ferenc Kovacs
1c13ad7c0e add missing NEWS entry to the correct release where it was added 2014-05-01 10:50:08 +02:00
Ferenc Kovacs
8b2fdb496d Merge branch 'PHP-5.6' 
* PHP-5.6:
  add some missing NEWS entries
 2014-05-01 10:44:31 +02:00
Ferenc Kovacs
f090ddeac7 add some missing NEWS entries 2014-05-01 10:43:34 +02:00
Michael Wallner
e7e44d7d56 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix test locality inconsitency
 2014-04-30 13:03:12 +02:00
Michael Wallner
42fbb952d7 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix test locality inconsitency
 2014-04-30 13:02:43 +02:00
Michael Wallner
b79301d11f fix test locality inconsitency 2014-04-30 13:01:59 +02:00