clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-26 20:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,555 Commits 494 Branches 1,367 Tags 881 MiB
0da5d94a6c
Commit Graph

79555 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
e9c9169e05 skip this test which fails without network 2014-06-20 06:45:16 +02:00
Ferenc Kovacs
2f43bc73b6 add missing entry to NEWS 2014-06-19 02:29:27 +02:00
Ferenc Kovacs
00677cd771 add missing entry to NEWS 2014-06-19 02:18:26 +02:00
Ferenc Kovacs
dd9f81dd47 add NEWS block for 5.6.0RC2 2014-06-19 01:34:25 +02: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
f201bf2305 Fix another problem with MySQL 5.7 2014-06-18 18:30:37 +03:00
Remi Collet
bf7fed7e41 new test, missing in ea466a3 2014-06-18 15:59:45 +02: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
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
Lior Kaplan
945938d33c Update copyright year to 2014 2014-06-17 23:56:46 +03:00
Remi Collet
ba34f0c2e8 NEWS 2014-06-17 09:41:10 +02:00
Remi Collet
ea466a316f Fix Request #67453 Allow to unserialize empty data. 
SplDoublyLinkedList, SplObjectStorage and ArrayObject have empty
constructor (no arg), so it make sense to allow to unserialize empty
data.

This allow the hack (used in various place, including PHPUnit) to
instanciate class without call to constructor to work.
 2014-06-17 09:38:54 +02:00
Lior Kaplan
b538816b0b Update copyright year to 2014 2014-06-16 23:34:50 +03:00
Lior Kaplan
11b18347d8 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update copyright year for re2c generated files
  Update copyright year to 2014
  Update copyright year for re2c files as well
 2014-06-16 23:32:10 +03:00
Lior Kaplan
c38b73a701 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update copyright year for re2c generated files
  Update copyright year to 2014
  Update copyright year for re2c files as well
 2014-06-16 23:30:44 +03:00
Lior Kaplan
6f3bcb0d6e Update copyright year for re2c generated files 2014-06-16 23:28:36 +03:00
Lior Kaplan
2d576c2a99 Update copyright year to 2014 2014-06-16 23:27:45 +03:00
Lior Kaplan
e667d23178 Update copyright year for re2c files as well 2014-06-16 23:26:50 +03:00
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
Remi Collet
6788f14f5e fix failed test 2014-06-16 10:52:26 +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
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
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
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