archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
78153 commits 526 branches 1434 tags 864 MiB
Commit graph

33284 commits

Author SHA1 Message Date
Anatol Belski
b502c0a3dc Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66395 basename function doesn't remove drive letter
 2014-01-03 22:39:17 +01:00
Anatol Belski
f0100261e1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66395 basename function doesn't remove drive letter
 2014-01-03 22:38:47 +01:00
Anatol Belski
d3a053d9f4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #66395 basename function doesn't remove drive letter
 2014-01-03 22:32:39 +01:00
Anatol Belski
46f60fae22 Fixed bug #66395 basename function doesn't remove drive letter 2014-01-03 22:25:58 +01:00
Xinchen Hui
b209c27302 Merge branch 'PHP-5.6' 2014-01-03 11:37:32 +08:00
Xinchen Hui
4e2ae5f5ca Here need to be str_efree 
found by ext/standard/tests/general_functions/phpinfo2.php fails
 2014-01-03 11:36:50 +08:00
Xinchen Hui
af6c11c5f0 Bump year 2014-01-03 11:11:57 +08:00
Xinchen Hui
0f53e37494 Merge branch 'PHP-5.6' 2014-01-03 11:09:07 +08:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0 Bump year 2014-01-03 11:04:26 +08:00
Derick Rethans
63d390cdf9 Merge branch 'PHP-5.6' 2014-01-02 12:47:52 +00:00
Derick Rethans
110b7dcfb8 Merge branch 'PHP-5.5' into PHP-5.6 2014-01-02 12:47:44 +00:00
Derick Rethans
5137cb5f0c Fixed (some of) add/sub. 
This worked in PHP 5.4 already, but with the introduction of DateTimeImmutable
this code was not correctly merged.
 2014-01-02 12:45:48 +00:00
Derick Rethans
dee77f237c Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2014-01-02 10:57:46 +00:00
Felipe Pena
57a6209051 Merge branch 'PHP-5.6' 
* PHP-5.6:
  - Fixed bug #66381 (__ss_family was changed on AIX 5.3)
 2014-01-01 09:57:03 -02:00
Felipe Pena
37897e258d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  - Fixed bug #66381 (__ss_family was changed on AIX 5.3)
 2014-01-01 09:56:49 -02:00
Felipe Pena
49cdde7326 Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5 2014-01-01 09:56:31 -02:00
Felipe Pena
5967fb194f - Fixed bug #66381 (__ss_family was changed on AIX 5.3) 2014-01-01 09:55:14 -02:00
Nikita Popov
73db3cda8b Merge branch 'PHP-5.6' 2013-12-30 14:41:45 +01:00
Nikita Popov
5408f1e5a6 Throw warning when converting invalid string to GMP 2013-12-30 14:38:09 +01:00
Nikita Popov
056f3441fd Merge branch 'PHP-5.6' 2013-12-30 13:59:55 +01:00
Nikita Popov
71a36fb6ae Merge branch 'PHP-5.5' into PHP-5.6 2013-12-30 13:58:29 +01:00
Nikita Popov
c7ee97eea0 Merge branch 'PHP-5.4' into PHP-5.5 2013-12-30 13:54:58 +01:00
Nikita Popov
3b6afb1bd6 Fix leak caused by fix to bug #65667 
ftp->stream is now closed in the ftp resource dtor.
 2013-12-30 13:53:12 +01:00
Remi Collet
a3c7971f94 Merge branch 'PHP-5.6' 
* PHP-5.6:
  missing file from libzip 0.11.2
 2013-12-30 10:00:19 +01:00
Remi Collet
33ef788abd missing file from libzip 0.11.2 2013-12-30 10:00:02 +01:00
Remi Collet
7844fb292c Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix compat for PHP ABI changes
 2013-12-30 08:47:23 +01:00
Remi Collet
3a492cf686 fix compat for PHP ABI changes 2013-12-30 08:47:16 +01:00
Remi Collet
764190c1d6 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Sync with pecl/zip 1.12.4dev
 2013-12-30 07:38:45 +01:00
Remi Collet
0a950a0500 Sync with pecl/zip 1.12.4dev 
- update bunled libzip to 0.11.2
- expose zip_file_set_external_attributes + zip_file_get_external_attributes
  with new methods:
	ZipArchive::setExternalAttributesName
	ZipArchive::setExternalAttributesIndex
	ZipArchive::getExternalAttributesName
	ZipArchive::getExternalAttributesIndex
 2013-12-30 07:35:30 +01:00
Xinchen Hui
6b34343479 Merge branch 'PHP-5.6' 2013-12-30 11:07:42 +08:00
Xinchen Hui
5a756afcf1 Merge branch 'PHP-5.5' into PHP-5.6 2013-12-30 11:07:37 +08:00
Xinchen Hui
ed5be4f7ad Fix test fail 2013-12-30 11:07:25 +08:00
Xinchen Hui
8b72df0608 Merge branch 'PHP-5.6' 2013-12-30 10:58:56 +08:00
Xinchen Hui
31d4d11432 Fix one more test in dos style eol 2013-12-30 10:58:40 +08:00
Xinchen Hui
f204df9a7f Merge branch 'PHP-5.5' into PHP-5.6 2013-12-30 10:58:23 +08:00
Xinchen Hui
6699b1f8ea Fix dos style eol in phpts 2013-12-30 10:58:01 +08:00
Xinchen Hui
408ae9a452 Merge branch 'PHP-5.6' 2013-12-30 10:52:21 +08:00
Xinchen Hui
a88543a106 Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style ^M as lineend) 2013-12-30 10:51:47 +08:00
Xinchen Hui
04c8ce259f Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style ^M as lineend) 
Use git blame -w to ingore the space changes
 2013-12-30 10:50:46 +08:00
Remi Collet
bd3e5aab1d Merge branch 'PHP-5.6' 
* PHP-5.6:
  minor fix on previous
 2013-12-28 14:29:38 +01:00
Remi Collet
809eb77689 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  minor fix on previous
 2013-12-28 14:29:27 +01:00
Remi Collet
464c219ed4 minor fix on previous 2013-12-28 14:29:14 +01:00
Remi Collet
8785e22bca Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop())
 2013-12-28 14:26:24 +01:00
Remi Collet
46809869a3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop())
 2013-12-28 14:26:06 +01:00
Remi Collet
8f4a5373bb Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop()) 
Initial fix was PHP stuff
This one is libgd fix.

- filter invalid crop size
- dont try to copy on invalid position
- fix crop size when out of src image
- fix possible NULL deref
- fix possible integer overfloow
 2013-12-28 14:22:13 +01:00
Xinchen Hui
1a4863d560 Merge branch 'PHP-5.6' 2013-12-27 14:07:15 +08:00
Xinchen Hui
04a52443e7 Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	main/php_version.h
 2013-12-27 14:06:35 +08:00
Xinchen Hui
2938329ce1 Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop()) 
And also fixed the bug: arguments are altered after some calls
 2013-12-27 14:04:59 +08:00