clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
80,432 Commits 491 Branches 1,363 Tags 838 MiB
18bde665f5
Commit Graph

80432 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui
18bde665f5 Merge branch 'PHP-5.6' 2014-06-24 13:53:43 +08:00
Xinchen Hui
9d49492fd6 Fixed bug #67368 (Memory leak with immediately dereferenced array in class constant) 2014-06-24 13:53:05 +08:00
Stanislav Malyshev
52cdbc5c10 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Better fix for bug #67072 with more BC provisions
  Better fix for bug #67072 with more BC provisions
 2014-06-23 22:15:21 -07:00
Stanislav Malyshev
6b8cef7847 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Better fix for bug #67072 with more BC provisions
  Better fix for bug #67072 with more BC provisions

Conflicts:
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
 2014-06-23 22:15:01 -07:00
Stanislav Malyshev
232ab8d795 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Better fix for bug #67072 with more BC provisions
 2014-06-23 22:13:32 -07:00
Remi Collet
70e29fc24c Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  Better fix for phpdbg + libedit - fix include - disable coloured prompt only with libedit
  Fix https://github.com/krakjoe/phpdbg/issues/91
 2014-06-23 10:39:22 +02:00
Remi Collet
b3ef019b62 NEWS 2014-06-23 10:39:06 +02:00
Remi Collet
0da5d94a6c Better fix for phpdbg + libedit 
- fix include
- disable coloured prompt only with libedit
 2014-06-23 10:21:19 +02:00
Remi Collet
0febafcfbe Fix https://github.com/krakjoe/phpdbg/issues/91 
Enable edit feature when build with libedit.

Notice: coloured prompt only enable with READLINE
 2014-06-23 10:21:19 +02:00
Remi Collet
a52b927bf3 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Better fix for phpdbg + libedit - fix include - disable coloured prompt only with libedit
  Fix https://github.com/krakjoe/phpdbg/issues/91
 2014-06-23 10:18:55 +02:00
Remi Collet
98d41dfc9d Better fix for phpdbg + libedit 
- fix include
- disable coloured prompt only with libedit
 2014-06-23 10:17:43 +02:00
Ferenc Kovacs
f5defa1cf2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  testcase for 67468 (only for debug build, as I could not create a stable segfault without loading other exts like pgsql)
  mention 67468 fix in NEWS
  Fix Bug #67468  Segfault in highlight_file()/highlight_string() when pgsql.so module is loaded
 2014-06-23 10:14:08 +02:00
Ferenc Kovacs
53158f2c32 testcase for 67468 (only for debug build, as I could not create a stable segfault without loading other exts like pgsql) 2014-06-23 10:10:17 +02:00
Ferenc Kovacs
3058b87783 mention 67468 fix in NEWS 2014-06-23 10:08:32 +02:00
Remi Collet
86bafec836 Fix https://github.com/krakjoe/phpdbg/issues/91 
Enable edit feature when build with libedit.

Notice: coloured prompt only enable with READLINE
 2014-06-23 10:04:40 +02:00
Andreas Ferber
c5e6c2a5f5 Fix Bug #67468 Segfault in highlight_file()/highlight_string() when pgsql.so module is loaded 
str_efree() must be used in zend_highlight() and zend_indent() to free
string data assigned to a zval to account for interned strings.
 2014-06-23 09:51:44 +02:00
Stanislav Malyshev
342240fd7f Better fix for bug #67072 with more BC provisions 2014-06-21 21:30:34 -07:00
Stanislav Malyshev
c42d5cf5de Better fix for bug #67072 with more BC provisions 2014-06-21 21:29:11 -07:00
Dmitry Stogov
687fa7d63d Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed MarinaDB support
 2014-06-20 14:01:22 +04:00
Dmitry Stogov
f08a5bfadc Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed MarinaDB support
 2014-06-20 13:58:26 +04:00
Dmitry Stogov
f0639611cf Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed MarinaDB support
 2014-06-20 13:57:38 +04:00
Dmitry Stogov
680ddabac1 Fixed MarinaDB support 2014-06-20 13:56:32 +04:00
Remi Collet
ae9db5d0a2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  skip this test which fails without network
 2014-06-20 06:45:36 +02:00
Remi Collet
e9c9169e05 skip this test which fails without network 2014-06-20 06:45:16 +02:00
Ferenc Kovacs
7c20edaade Merge branch 'PHP-5.6' 
* PHP-5.6:
  add missing entry to NEWS
 2014-06-19 02:29:42 +02:00
Ferenc Kovacs
2f43bc73b6 add missing entry to NEWS 2014-06-19 02:29:27 +02:00
Ferenc Kovacs
deb650f182 Merge branch 'PHP-5.6' 
* PHP-5.6:
  add missing entry to NEWS
 2014-06-19 02:18:52 +02:00
Ferenc Kovacs
00677cd771 add missing entry to NEWS 2014-06-19 02:18:26 +02:00
Ferenc Kovacs
8bca4f0c32 Merge branch 'PHP-5.6' 
* PHP-5.6:
  add NEWS block for 5.6.0RC2
 2014-06-19 01:35:19 +02:00
Ferenc Kovacs
dd9f81dd47 add NEWS block for 5.6.0RC2 2014-06-19 01:34:25 +02:00
Andrey Hristov
2eb42c953d Merge branch 'PHP-5.6' 
Conflicts:
	NEWS
 2014-06-18 21:54:26 +03:00
Andrey Hristov
a886a0cf93 Add support for gb18030/MySQL 5.7 2014-06-18 21:53:34 +03:00
Andrey Hristov
6dd0e8e0fc Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-06-18 18:32:51 +03:00
Andrey Hristov
af94a01ebe Merge branch 'master' of git.php.net:php-src 2014-06-18 18:31:07 +03:00
Andrey Hristov
29cef140ed Merge branch 'PHP-5.6' 2014-06-18 18:30:49 +03:00
Andrey Hristov
f201bf2305 Fix another problem with MySQL 5.7 2014-06-18 18:30:37 +03:00
Remi Collet
e3b74cb168 Merge branch 'PHP-5.6' 
* PHP-5.6:
  new test, missing in ea466a3
 2014-06-18 16:00:07 +02:00
Remi Collet
bf7fed7e41 new test, missing in ea466a3 2014-06-18 15:59:45 +02:00
Andrey Hristov
ea1632d697 Merge branch 'PHP-5.6' 2014-06-18 16:45:12 +03:00
Andrey Hristov
23f77050eb Merge branch 'PHP-5.5' into PHP-5.6 2014-06-18 16:42:42 +03:00
Andrey Hristov
21c9a9388f Suppress test failure with MySQL 5.7 2014-06-18 16:20:14 +03:00
Lior Kaplan
eba7c77685 Update copyright year to 2014 2014-06-18 00:22:16 +03:00
Lior Kaplan
9d047bb138 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
 2014-06-18 00:21:20 +03:00
Lior Kaplan
b0b47a2064 Update copyright year to 2014 2014-06-18 00:18:47 +03:00
Lior Kaplan
9f727692b6 Update copyright year to 2014 
Align with online version at http://www.php.net/license/3_01.txt
 2014-06-18 00:16:23 +03:00
Lior Kaplan
1222f51ebd Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
 2014-06-18 00:14:18 +03:00
Lior Kaplan
728c554f93 Update copyright year to 2014 2014-06-18 00:12:33 +03:00
Lior Kaplan
a3bd2d268c Update copyright year to 2014 
Align with online version at http://www.php.net/license/3_01.txt
 2014-06-18 00:11:55 +03:00
Lior Kaplan
d2bdedbcfc Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update copyright year to 2014
  Update copyright year to 2014
 2014-06-18 00:11:35 +03:00
Lior Kaplan
4106d48d1c Update copyright year to 2014 2014-06-17 23:57:20 +03:00