php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 19:23:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
77,918 Commits 549 Branches 1,486 Tags
b5f245db37dbe65bd27637fc48f2f74fff7786c5
Commit Graph

33163 Commits

Author SHA1 Message Date
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
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 5408f1e5a6 Throw warning when converting invalid string to GMP 2013-12-30 14:38:09 +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 33ef788abd missing file from libzip 0.11.2 2013-12-30 10:00:02 +01:00
Remi Collet 3a492cf686 fix compat for PHP ABI changes 2013-12-30 08:47:16 +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 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 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 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 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 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 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
Dmitry Stogov 03a37de9b3 Improved empty string handling. Now ZE uses an interned string instead of allocation new empty string each time. (Some extensions might need to be fixed using str_efree() instead of efree() to support interned strings). 2013-12-26 14:47:13 +04:00
Anatol Belski 9f9179cc62 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  brought the ext/sybase_ct/config.w32 up to date
 2013-12-25 23:30:59 +01:00
Anatol Belski 5b0620831c brought the ext/sybase_ct/config.w32 up to date 2013-12-25 23:29:42 +01:00
Xinchen Hui d316040857 Fix test 2013-12-25 15:34:39 +08:00
Joe Watkins e538c1ad3f update credits headers 2013-12-24 09:03:22 +00:00
Dmitry Stogov a00e7f22d2 Fixed bug #66338 (Optimization binding of class constants is not safely opcacheable) 2013-12-23 16:53:34 +04:00
Dmitry Stogov ccb29a6e41 Fixed bug #66334 (Memory Leak in new pass1_5.c optimizations). (Terry) 2013-12-23 16:04:10 +04:00
Dmitry Stogov 8650d2dda6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Added suggestion about opcache.revalidate_freq setting in development environment
 2013-12-23 13:10:42 +04:00
Dmitry Stogov f7b6db7555 Added suggestion about opcache.revalidate_freq setting in development environment 2013-12-23 13:09:45 +04:00
Dmitry Stogov f5c200fce9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed Issue #140: "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq"
  opcodes
 2013-12-23 12:50:42 +04:00
Dmitry Stogov 0dcaf0f445 Fixed Issue #140: "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq" 2013-12-23 12:46:30 +04:00
krakjoe 2a1b60569f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  stop warnings from unused opcode map
  - BFN
  - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
  Included new .c file in build too
  Fixed little typo in zend_vm_gen.php
  Moved to new file, killing a lot of warnings
 2013-12-22 13:11:20 +00:00
Felipe Pena 8e36d36ee6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
 2013-12-22 09:42:58 -02:00
Felipe Pena a056113586 - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com 2013-12-22 09:42:45 -02:00
Christopher Jones 794df91c35 Align 'configure --help' columns 2013-12-20 10:02:46 -08:00
Boris Lytochkin 285c0bcec0 Merge branch '5.5' into 5.6 
* 5.5:
  Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin)
  Fixed SNMP_ERR_TOOBIG handling for bulk walk operations
 2013-12-20 00:39:15 +04:00
Boris Lytochkin b65bd30e89 Merge branch '5.4' into 5.5 
* 5.4:
  Fixed SNMP_ERR_TOOBIG handling for bulk walk operations
 2013-12-20 00:26:34 +04:00
Boris Lytochkin bb51d0e4c0 Fixed SNMP_ERR_TOOBIG handling for bulk walk operations 2013-12-20 00:25:16 +04:00
Derick Rethans d4f4b66d43 Merge branch 'PHP-5.5' into PHP-5.6 2013-12-19 19:01:00 +00:00
Derick Rethans 7a402ca51e Merge branch 'PHP-5.4' into PHP-5.5 2013-12-19 18:58:45 +00:00
Derick Rethans e881334e49 - Updated to version 2013.9 (2013i) 2013-12-19 18:58:44 +00:00
Remi Collet f6ffecbd2d save a few memory 2013-12-19 10:55:26 +01:00
Remi Collet 99b91f98b1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
 2013-12-19 10:54:06 +01:00
Remi Collet 32d1d5fb59 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
 2013-12-19 10:53:50 +01:00
Remi Collet 20eb8e4d11 Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real) 2013-12-19 10:53:38 +01:00