summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into PHP-7.0.0php-7.0.0alpha1Ferenc Kovacs2015-06-106-10/+403
|\
| * Merge branch 'PHP-5.6'Ferenc Kovacs2015-06-100-0/+0
| |\
| | * Merge branch 'PHP-5.5' into PHP-5.6Ferenc Kovacs2015-06-100-0/+0
| | |\
| | | * add missing NEWS entriesFerenc Kovacs2015-06-101-0/+10
| | * | add missing NEWS entriesFerenc Kovacs2015-06-101-0/+10
| * | | Merge branch 'PHP-5.6'Stanislav Malyshev2015-06-094-9/+394
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-06-090-0/+0
| | |\ \ | | | |/
| | | * Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-06-090-0/+0
| | | |\
| | | | * add NEWSStanislav Malyshev2015-06-091-1/+7
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-06-092-0/+373
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-06-092-0/+373
| | | |\ \ | | | | |/
| | | | * Fixed bug #68776Yasuo Ohgaki2015-06-092-0/+373
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-06-091-2/+2
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'PHp-5.4' into PHP-5.5Stanislav Malyshev2015-06-091-2/+2
| | | |\ \ | | | | |/
| | | | * fix testStanislav Malyshev2015-06-091-2/+2
| | | | * update NEWSStanislav Malyshev2015-06-091-0/+6
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-06-093-11/+31
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-06-093-11/+31
| | | |\ \ | | | | |/
| | | | * Fix bug #69646 OS command injection vulnerability in escapeshellargStanislav Malyshev2015-06-091-0/+8
| | | | * Fix #69719 - more checks for nulls in pathsStanislav Malyshev2015-06-092-13/+25
| | | | * fix test descriptionRemi Collet2015-06-091-1/+1
| | | | * Fixed Buf #68812 Unchecked return value.George Wang2015-06-081-4/+14
| * | | | Fixed bug #69646 (OS command injection vulnerability in escapeshellarg)Stanislav Malyshev2015-06-091-0/+8
| * | | | fix typoFerenc Kovacs2015-06-091-1/+1
* | | | | Merge branch 'master' into PHP-7.0.0Ferenc Kovacs2015-06-091-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | fix hard-coded path in testFerenc Kovacs2015-06-091-1/+1
* | | | | 7.0.0alpha1Ferenc Kovacs2015-06-093-5/+3
|/ / / /
* | | | prepare for 7.0.0alpha1Ferenc Kovacs2015-06-091-7/+9
* | | | Merge branch 'PHP-5.6'Ferenc Kovacs2015-06-090-0/+0
|\ \ \ \ | |/ / /
| * | | fix NEWSFerenc Kovacs2015-06-091-0/+4
* | | | Merge branch 'PHP-5.6'Ferenc Kovacs2015-06-090-0/+0
|\ \ \ \ | |/ / /
| * | | these will be part of 5.6.11Ferenc Kovacs2015-06-091-8/+8
* | | | Merge branch 'PHP-5.6'Ferenc Kovacs2015-06-090-0/+0
|\ \ \ \ | |/ / /
| * | | add missing NEWS entryFerenc Kovacs2015-06-091-1/+5
* | | | Merge branch 'PHP-5.6'Julien Pauli2015-06-090-0/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2015-06-090-0/+0
| |\ \ \ | | |/ /
| | * | 5.5.27 nowJulien Pauli2015-06-093-20/+26
* | | | Merge branch 'PHP-5.6'Remi Collet2015-06-091-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2015-06-091-1/+1
| |\ \ \ | | |/ /
| | * | fix test descriptionRemi Collet2015-06-091-1/+1
| | * | Fixed Buf #68812 Unchecked return value.George Wang2015-06-081-4/+14
| * | | Fixed Buf #68812 Unchecked return value.George Wang2015-06-081-4/+14
* | | | Merge branch 'PHP-5.6'Lior Kaplan2015-06-082-2207/+4818
|\ \ \ \ | |/ / /
| * | | NEWS entry for: Upgrade bundled sqlite to 3.8.10.2Lior Kaplan2015-06-081-0/+4
| * | | Merge branch 'PHP-5.5' into PHP-5.6Lior Kaplan2015-06-082-2207/+4818
| |\ \ \ | | |/ /
| | * | NEWS entry for: Upgrade bundled sqlite to 3.8.10.2Lior Kaplan2015-06-081-0/+4
| | * | Merge branch 'PHP-5.4' into PHP-5.5Lior Kaplan2015-06-080-0/+0
| | |\ \ | | | |/
| | | * NEWS entry for: Upgrade bundled sqlite to 3.8.10.2Lior Kaplan2015-06-081-0/+4
| | | * Upgrade bundled sqlite to 3.8.10.2Lior Kaplan2015-06-083-25800/+54438
| | | * Add CVE used in PHP 5.4.39, 5.4.40, 5.4.41Lior Kaplan2015-06-081-11/+17