clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 15:26:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
72,378 Commits 494 Branches 1,367 Tags 807 MiB
db74b9c76e
Commit Graph

72378 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui
db74b9c76e Merge branch 'PHP-5.5' 2012-11-30 14:50:35 +08:00
Xinchen Hui
9f7e53fde8 Merge branch 'PHP-5.4' into PHP-5.5 2012-11-30 14:50:01 +08:00
Xinchen Hui
35f636019d Merge branch 'PHP-5.3' into PHP-5.4 2012-11-30 14:49:35 +08:00
Xinchen Hui
ff6c9e2726 Fixed bug #63377 (Segfault on output buffer) 2012-11-30 14:48:51 +08:00
Xinchen Hui
79331f7533 Merge branch 'PHP-5.5' 2012-11-30 14:34:10 +08:00
Xinchen Hui
055b6c9ce0 Merge branch 'PHP-5.4' into PHP-5.5 2012-11-30 14:33:52 +08:00
Xinchen Hui
96300f551a format 2012-11-30 14:33:29 +08:00
Xinchen Hui
dc36933181 Merge branch 'PHP-5.3' into PHP-5.4 2012-11-30 14:33:24 +08:00
Xinchen Hui
00d86afedf Format 2012-11-30 14:32:15 +08:00
Xinchen Hui
d173909e88 Merge branch 'PHP-5.5' 2012-11-30 14:31:19 +08:00
Xinchen Hui
093d119597 Merge branch 'PHP-5.4' into PHP-5.5 2012-11-30 14:30:37 +08:00
Xinchen Hui
b689819567 Merge branch 'PHP-5.3' into PHP-5.4 2012-11-30 14:29:59 +08:00
Xinchen Hui
40fabf68ed Fixed bug #63398 (Segfault when polling closed link) 2012-11-30 14:28:32 +08:00
Dmitry Stogov
2d458b2348 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests)
 2012-11-29 16:45:22 +04:00
Dmitry Stogov
9e1d3cfdab Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests) 2012-11-29 16:44:19 +04:00
Dmitry Stogov
7f7cff0bbb Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests)

Conflicts:
	NEWS
	ext/soap/soap.c
 2012-11-29 16:41:09 +04:00
Dmitry Stogov
dc2192c087 Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests) 2012-11-29 16:31:08 +04:00
Dmitry Stogov
2cfe91f684 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #61557 (Crasher in tt-rss backend.php)
 2012-11-29 14:43:46 +04:00
Dmitry Stogov
bf6fea6ba0 Fixed bug #61557 (Crasher in tt-rss backend.php) 2012-11-29 14:41:20 +04:00
Dmitry Stogov
1a09bf8023 Fixed bug #61557 (Crasher in tt-rss backend.php) 2012-11-29 14:38:18 +04:00
Dmitry Stogov
8b7df4bbd8 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #63635 (Segfault in gc_collect_cycles)
 2012-11-29 13:48:44 +04:00
Dmitry Stogov
3c1888f584 Fixed bug #63635 (Segfault in gc_collect_cycles) 2012-11-29 13:06:12 +04:00
Dmitry Stogov
f877d7fee6 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #63635 (Segfault in gc_collect_cycles)

Conflicts:
	NEWS
 2012-11-29 12:38:34 +04:00
Dmitry Stogov
92e2f29381 Fixed bug #63635 (Segfault in gc_collect_cycles) 2012-11-29 12:25:20 +04:00
Remi Collet
c37d7a9456 NEWS 2012-11-28 10:45:23 +01:00
Remi Collet
351e80e753 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed Bug #63581 Possible buffer overflow
  Fixed Bug #63581 Possible null dereference
 2012-11-28 10:39:23 +01:00
Remi Collet
bc7f2b5f41 Merge branch 'PHP-5.3' into PHP-5.5 
* PHP-5.3:
  Fixed Bug #63581 Possible buffer overflow
  Fixed Bug #63581 Possible null dereference
 2012-11-28 10:38:37 +01:00
Remi Collet
487b7c7f32 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed Bug #63581 Possible buffer overflow
  Fixed Bug #63581 Possible null dereference
 2012-11-28 10:38:13 +01:00
Remi Collet
bc492007da Fixed Bug #63581 Possible buffer overflow 
In fpm-log, possible buffer overflow. Check for length is done at
the beginning of the loop, so is not done when overflow occurs
on the last loop (len = 1024 or 1025). (ack from fat).

This issue where found from by static code analysis tool and, so,
I can't provide any reproducer.
 2012-11-28 10:35:04 +01:00
Remi Collet
e4eb026834 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  BFN #61272
  fix bug #61272 ob_start callback get passed empty string
 2012-11-28 10:32:23 +01:00
Remi Collet
9519d2b585 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
  updated NEWS
  Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
  This test isn't supposed to pass on windows
  Fixed Bug #63614 (Fatal error on Reflection)
 2012-11-28 10:32:00 +01:00
Remi Collet
0f4772d12f Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 
* 'PHP-5.4' of git.php.net:php-src:
  BFN #61272
  fix bug #61272 ob_start callback get passed empty string
  Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
  This test isn't supposed to pass on windows
  Fixed Bug #63614 (Fatal error on Reflection)
 2012-11-28 10:31:49 +01:00
Remi Collet
f08060a48f Fixed Bug #63581 Possible null dereference 
Possible NULL dereference when trying to delete the single item
of a list (ack from fat).

This issues where found from by static code analysis tool and,
so, I can't provide any reproducer.
 2012-11-28 10:28:18 +01:00
Michael Wallner
178e9919b2 Merge branch 'PHP-5.4' 2012-11-28 10:24:42 +01:00
Remi Collet
1e6baa2673 Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3 
* 'PHP-5.3' of git.php.net:php-src:
  Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
  This test isn't supposed to pass on windows
  Fixed Bug #63614 (Fatal error on Reflection)
 2012-11-28 10:24:32 +01:00
Remi Collet
6c7c11c2cc Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  updated NEWS
  Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
  This test isn't supposed to pass on windows
  Fixed Bug #63614 (Fatal error on Reflection)
 2012-11-28 10:23:50 +01:00
Michael Wallner
be1e5b9c54 BFN #61272 2012-11-28 10:23:26 +01:00
Michael Wallner
575790e842 fix bug #61272 ob_start callback get passed empty string 2012-11-28 10:19:44 +01:00
Anatoliy Belsky
df3e1fd484 Merge branch 'PHP-5.5' 
* PHP-5.5:
  updated NEWS
  Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows

Conflicts:
	NEWS
 2012-11-27 17:05:48 +01:00
Anatoliy Belsky
ca240f5b22 updated NEWS 2012-11-27 16:59:27 +01:00
Anatoliy Belsky
f094723852 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows

Conflicts:
	NEWS
 2012-11-27 16:55:47 +01:00
Anatoliy Belsky
d88017e992 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows

Conflicts:
	NEWS
	ext/fileinfo/libmagic.patch
	ext/fileinfo/tests/finfo_open_error-win32.phpt
 2012-11-27 16:45:25 +01:00
Anatoliy Belsky
e6b727d3b7 Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows 2012-11-27 16:33:58 +01:00
Anatoliy Belsky
1e8b6536ab Merge branch 'PHP-5.5' 
* PHP-5.5:
  This test isn't supposed to pass on windows
 2012-11-27 16:14:00 +01:00
Anatoliy Belsky
17e21925c8 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  This test isn't supposed to pass on windows
 2012-11-27 16:13:19 +01:00
Anatoliy Belsky
e0ad33c24a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  This test isn't supposed to pass on windows
 2012-11-27 16:11:53 +01:00
Anatoliy Belsky
eff12e56b6 This test isn't supposed to pass on windows 2012-11-27 16:02:55 +01:00
Xinchen Hui
344f228798 Merge branch 'PHP-5.5' 2012-11-27 13:38:38 +08:00
Xinchen Hui
8337c96656 Merge branch 'PHP-5.4' into PHP-5.5 2012-11-27 13:37:50 +08:00
Xinchen Hui
070239a194 Merge branch 'PHP-5.3' into PHP-5.4 2012-11-27 13:36:38 +08:00