php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-20 14:31:06 +02:00
Code Issues Packages Projects Releases Wiki Activity
77,074 Commits 547 Branches 1,483 Tags
2ba9681e8efaeddb96a0e2e7d43c50df363d8723
Commit Graph

33188 Commits

Author SHA1 Message Date
Stanislav Malyshev
e10af61862 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #68776
 2015-06-09 21:33:38 -07:00
Yasuo Ohgaki
9d168b863e Fixed bug #68776 2015-06-09 21:32:54 -07:00
Stanislav Malyshev
6b53b7cd84 Merge branch 'PHp-5.4' into PHP-5.5 
* PHp-5.4:
  fix test
  update NEWS
 2015-06-09 17:12:11 -07:00
Stanislav Malyshev
eee8b6c33f fix test 2015-06-09 17:11:33 -07:00
Stanislav Malyshev
4e2fb47092 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #69646	OS command injection vulnerability in escapeshellarg
  Fix #69719 - more checks for nulls in paths
  fix test description
  Fixed Buf #68812 Unchecked return value.

Conflicts:
	ext/dom/document.c
	ext/gd/gd.c
 2015-06-09 15:31:27 -07:00
Stanislav Malyshev
8036758491 Fix bug #69646 OS command injection vulnerability in escapeshellarg 2015-06-09 10:52:38 -07:00
Stanislav Malyshev
f7d7befae8 Fix #69719 - more checks for nulls in paths 2015-06-09 10:52:38 -07:00
Remi Collet
531c306fe6 fix test description 2015-06-09 09:18:54 +02:00
Remi Collet
b347f2c47a fix test description 2015-06-09 09:12:59 +02:00
Lior Kaplan
b5d1530e4f Upgrade bundled sqlite to 3.8.10.2 
Includes fixes for CVE-2015-3414, CVE-2015-3415, CVE-2015-3416 done in 3.8.9
 2015-06-08 22:29:10 +03:00
Lior Kaplan
7ced40e24e Upgrade bundled sqlite to 3.8.10.2 
Includes fixes for CVE-2015-3414, CVE-2015-3415, CVE-2015-3416 done in 3.8.9
 2015-06-08 22:17:06 +03:00
Anatol Belski
17f2d1e8a7 fixed test related to fix for bug #67805 2015-06-08 13:27:22 +02:00
Willian Gustavo Veiga
b470d9a0d6 Fix bug #67805 - SplFileObject setMaxLineLength. 2015-06-08 12:08:05 +02:00
Xinchen Hui
9a0bdd9069 Fixed invalid read druing apache reload 2015-06-04 21:08:36 +08:00
Stanislav Malyshev
1cbd25ca15 Fix bug #69737 - Segfault when SplMinHeap::compare produces fatal error 2015-06-01 22:07:16 -07:00
Stanislav Malyshev
8746163153 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  improve fix for Bug #69545
 2015-05-31 17:29:53 -07:00
Stanislav Malyshev
0765623d69 improve fix for Bug #69545 2015-05-31 17:29:00 -07:00
Christoph M. Becker
b24fedbd24 split the original test to check behaviour diff on 32- and 64-bit 2015-05-31 21:28:44 +02:00
Christoph M. Becker
e44b040faf recovered original meaning of SXE xpath test 2015-05-31 21:27:02 +02:00
Anatol Belski
1e9522021a backport the basic code to properly recognize win 8.1 and 10 2015-05-31 19:01:58 +02:00
Anatol Belski
05351f9ccb add test 2015-05-31 18:13:33 +02:00
Stanislav Malyshev
930fb8b1f3 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update PCRE version (bug #69689)
  move test
  NEWS 5.4
  fix new test
  Fixed Bug #69667 segfault in php_pgsql_meta_data
  5.4.42 next

Conflicts:
	configure.in
	main/php_version.h
 2015-05-30 21:18:28 -07:00
Stanislav Malyshev
f38ca75a3c Update PCRE version (bug #69689) 2015-05-30 21:17:16 -07:00
Anatol Belski
5683b6fa39 Refactored the fix for bug #66084, by cmb@php.net 2015-05-29 21:16:56 +02:00
Remi Collet
09b92a3a54 Relax a little this test, because random is not reliable 
Usual values are 3500-3950, but >4000 can happen.
 2015-05-28 10:35:19 +02:00
Remi Collet
e807e07bfa Fixed Bug #69479 GD fails to build with newer libvpx 
From upstream d41eb72cd4

Fix build with latest libvpx 1.4.0

These new constants exist at least since 1.0.0
Compatibility ones have been droped in 1.4.0
 2015-05-24 09:37:12 +02:00
Anatol Belski
d9c266f4c9 fix test 
Sometimes the path is unixified, sometimes not, so better don't
care about the slash in this case.
 2015-05-22 21:25:52 +02:00
ponce
c3d983f3af Make the phar symlink relative 
or we got a symlink pointing to the build files
thanks also to remicollet
 2015-05-21 14:03:18 +02:00
Christoph M. Becker
96629091a6 added missing GLOB_BRACE support check 2015-05-21 09:44:18 +02:00
Christoph M. Becker
6895ae4553 added SKIPIF section to test to make sure that GLOB_BRACE is supported 2015-05-21 09:44:17 +02:00
Christoph M. Becker
90aee01c85 added PHPT to check for bug #69628 2015-05-21 09:44:14 +02:00
Anatol Belski
75286ece1a fix handling VAR vs VAR= in putenv 
using _putenv_s eliminates behavior diff in TS/NTS
 2015-05-21 08:19:54 +02:00
Remi Collet
88aab478bf move test 2015-05-20 14:03:41 +02:00
Remi Collet
3be4e5d71a move test 2015-05-20 14:02:13 +02:00
Remi Collet
3ee3066bd0 fix new test 2015-05-20 08:46:14 +02:00
Remi Collet
f93d24aa67 Fixed Bug #69667 segfault in php_pgsql_meta_data 
Incomplete fix for #68741
 2015-05-20 08:46:01 +02:00
Remi Collet
716fe10d97 fix new test 2015-05-20 08:30:27 +02:00
Remi Collet
2cc4e69cc6 Fixed Bug #69667 segfault in php_pgsql_meta_data 
Incomplete fix for #68741
 2015-05-20 08:08:41 +02:00
Remi Collet
58e5e006e5 fix test output (32bits) 2015-05-14 10:28:59 +02:00
Leigh
f7952b90ca Close fd at the end, otherwise people complain 
Even though it's closed when the process terminates!
 2015-05-13 14:18:32 +02:00
Leigh
c02c4aca00 Add file descriptor caching to mcrypt_create_iv() 
This improves performance for applications that make repeated calls to
mcrypt_create_iv()
 2015-05-13 14:18:32 +02:00
Stanislav Malyshev
c08f9c2c78 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix format
  update NEWS
  Add test for bug #69522
  Update tests
  Fix bug #69522 - do not allow int overflow
  Forgot test file
  Fix bug #69403 and other int overflows
  Fixed bug #69418 - more s->p fixes for filenames
  Fixed bug #69364 - use smart_str to assemble strings
  Fix bug #69453 - don't try to cut empty string
  Fix bug #69545 - avoid overflow when reading list

Conflicts:
	ext/pcntl/pcntl.c
	ext/standard/basic_functions.c
	ext/standard/pack.c
	ext/standard/tests/dir/opendir_variation1-win32.phpt
 2015-05-12 14:24:15 -07:00
Stanislav Malyshev
9c0813fd48 Add test for bug #69522 2015-05-11 01:10:35 -07:00
Stanislav Malyshev
634aa0a2db Update tests 2015-05-11 00:12:39 -07:00
Stanislav Malyshev
ba1d9cc4b7 Fix bug #69522 - do not allow int overflow 2015-05-10 23:06:08 -07:00
Stanislav Malyshev
e2bbf0a2df Forgot test file 2015-05-10 02:24:29 -07:00
Stanislav Malyshev
c591f022f8 Fix bug #69403 and other int overflows 2015-05-10 02:20:08 -07:00
Stanislav Malyshev
be9b2a95ad Fixed bug #69418 - more s->p fixes for filenames 2015-05-10 02:09:38 -07:00
Stanislav Malyshev
473ec539a1 Fix #48147 - implement manual handling of //IGNORE for broken libc 
Conflicts:
	ext/iconv/iconv.c
 2015-05-09 18:54:40 -07:00
Dmitry Stogov
8026001943 Fixed bug #69549 (Memory leak with opcache.optimization_level=0xFFFFFFFF) 2015-05-07 12:14:14 +03:00