php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-23 16:08:35 +02:00
Code Issues Packages Projects Releases Wiki Activity
77,255 Commits 549 Branches 1,485 Tags
b1bd4119bcafab6f9a8f84d92cd65eec3afeface
Commit Graph

112 Commits

Author SHA1 Message Date
Stanislav Malyshev 4aeff30337 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix unit tests
 2015-09-01 12:23:55 -07:00
Stanislav Malyshev 1922c650ba fix unit tests 2015-09-01 12:23:22 -07:00
Stanislav Malyshev 33d3acaae7 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Improve fix for #70172
  Fix bug #70312 - HAVAL gives wrong hashes in specific cases
  fix test
  add test
  Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList
  Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage
  Fix bug #70172 - Use After Free Vulnerability in unserialize()
  Fix bug #70388 - SOAP serialize_function_call() type confusion
  Fixed bug #70350: ZipArchive::extractTo allows for directory traversal when creating directories
  Improve fix for #70385
  Fix bug #70345 (Multiple vulnerabilities related to PCRE functions)
  Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes)
  Fix bug #70219 (Use after free vulnerability in session deserializer)
  Fix for bug #69782
  Add CVE IDs asigned (post release) to PHP 5.4.43
  Add CVE IDs asigned to #69085 (PHP 5.4.39)
  5.4.45 next

Conflicts:
	configure.in
	ext/pcre/php_pcre.c
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
	main/php_version.h
 2015-09-01 11:42:19 -07:00
Stanislav Malyshev 1390a5812b Fix bug #70312 - HAVAL gives wrong hashes in specific cases 2015-09-01 01:16:30 -07:00
Stanislav Malyshev 0cb9d75cb6 Merge branch 'PHP-5.4.40' into PHP-5.5.24 
* PHP-5.4.40:
  Additional fix for bug #69324
  More fixes for bug #69152
  Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)
  Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar)
  Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
  Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
  Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
  Fixed bug #68901 (use after free)
  Fixed bug #68740 (NULL Pointer Dereference)
  Fix bug #66550 (SQLite prepared statement use-after-free)
  Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467
  Fix bug #68601 buffer read overflow in gd_gif_in.c
  Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4"
  Fixed bug #69293
  Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.
 2015-04-11 16:56:12 -07:00
Stanislav Malyshev 4435b9142f Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions) 2015-04-11 16:53:22 -07:00
Xinchen Hui 73c1be2653 Bump year 2015-01-15 23:26:03 +08:00
Nikita Popov 06bbb657ad Fix hash_pbkdf2() with missing $length argument 
Also change the type of some string length variables to ensure
that the zpp call works correctly on platforms where sizeof(int)
!= sizeof(long).
 2014-03-12 14:16:18 +01: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
Christopher Jones c6d977dd39 Fix long-standing visual pain point: the misalignment of './configure help' text. 
Whitespace changes and a couple of grammar fixes.
 2013-08-06 11:06:09 -07:00
Veres Lajos 4749457a49 HASH_KEY_NON_EXISTANT fix 2013-07-21 20:09:53 -07:00
Veres Lajos e9a95d78ef typo fixes 2013-07-15 00:23:03 -07:00
Veres Lajos 72085b0e5f typo fixes 2013-07-15 00:18:57 -07:00
Stanislav Malyshev 02e4d7a290 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:30:59 -07:00
Stanislav Malyshev ac40c0b562 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:20:18 -07:00
Anthony Ferrara 540a5a52e8 Fix #64745 hash_pbkdf2 truncation issue 
When using hash_pbkdf2 with hex output and 0 length (auto), it incorrectly
truncates the result to 1/2 the expected result.
 2013-05-28 15:30:45 -04:00
Xinchen Hui a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui 0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Anthony Ferrara 03536e889a More cleanup of documentation and comments, as well as code formatting 2012-06-12 15:05:44 -04:00
Anthony Ferrara 2f1cd2cb13 Fix tests to use proper casing 2012-06-12 14:52:43 -04:00
Anthony Ferrara 43eb8dc04a Remove un-needed memset, and replacing stray spaces 2012-06-12 14:32:21 -04:00
Anthony Ferrara df3d351cad Update error messages to be more inline with PHP standards 2012-06-12 14:10:35 -04:00
Anthony Ferrara 4918acccc6 refactor away un-necessary casts in hashing routines 2012-06-12 14:09:16 -04:00
Anthony Ferrara 6387498823 Create hash_pbkdf2 function addition 2012-06-12 09:57:11 -04:00
Michael Wallner 260e77709d fix tests failing due to corrected hash tiger 
mhash_00{1,3}.phpt were failing because of the corrected hash tiger byte
output order

fixes bug #60922:
 tests fail for mhash() and mhash_keygen_s2k() functions and MHASH_TIGER
 2012-03-19 21:49:47 +01:00
Michael Wallner 6a7bbb1561 merge ext/hash from trunk 2012-01-18 09:15:34 +00:00
Felipe Pena 4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Xinchen Hui 42fd7352fb Add skipif 2011-09-06 09:29:04 +00:00
Felipe Pena 4b30846b50 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Pierre Joye 45420bb669 - remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ, missing tests changes in 5.4 2011-07-22 11:56:20 +00:00
Felipe Pena 32b5f8a1a3 - Added new parameter parsing option (p - for valid path (string without null byte in the middle)) 
# The tests will be fixed in the next commits
 2011-06-06 21:28:16 +00:00
Felipe Pena 0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Pierre Joye a7ffa09e18 - add PHP_INSTALL_HEADERS to all parts (core&exts) exposing headers, generate the install-headers cmd 2010-12-11 22:18:10 +00:00
Ilia Alshanetsky 50e6d20d3c Fixed bug #51003 (unaligned memory access in ext/hash/hash_tiger.c). 2010-11-22 13:12:28 +00:00
Adam Harvey 18096f4b68 Implemented FR #53213 (Adler32 algorithm is very slow). Patch by zavasek at 
yandex dot ru.
 2010-11-08 09:35:33 +00:00
Kalle Sommer Nielsen 466c0b88d7 Fixed signedness compiler warning 2010-09-23 03:33:36 +00:00
Kalle Sommer Nielsen aeb1dc7cc4 Fixed bug #51943 (Several files are out of ANSI spec) 
# Based on patch by CoreyStup at gmail dot com
 2010-07-13 23:59:54 +00:00
Felipe Pena e66279a55e - Fixed bug #52240 (hash_copy() does not copy the HMAC key, causes wrong results and PHP crashes) 2010-07-03 13:06:14 +00:00
Kalle Sommer Nielsen dd8e59da8f Removed safe_mode 
* Removed ini options, safe_mode*
 * Removed --enable-safe-mode --with-exec-dir configure options on Unix
 * Updated extensions, SAPI's and core
 * php_get_current_user() is now declared in main.c, thrus no need to include safe_mode.h anymore
 2010-04-26 23:53:30 +00:00
Stanislav Malyshev 129019b9fc fix 64-bit integer overflow in mhash_keygen_s2k 2010-04-20 00:45:07 +00:00
Martin Jansen 71ec12cc78 JOAAT hashing now supports incremental hashing. 2010-03-28 10:01:02 +00:00
Martin Jansen 2bc269d375 Fixed test for the recently added algorithmus and made it more 
debuggable by adding the names of the algorithmus to the output.
 2010-03-25 16:05:27 +00:00
Rob Richards 7bfd44f79c fix build - there are now 34 algos 2010-03-25 15:10:49 +00:00
Pierre Joye 3054f00621 - init hval 2010-03-25 10:00:31 +00:00
Martin Jansen 0a852eab93 Added FNV and Jenkins's one-at-a-time support to the Windows build. 2010-03-24 16:30:37 +00:00
Martin Jansen 3842a993fe Added Jenkins's one-at-a-time hash support to ext/hash. 2010-03-24 15:47:40 +00:00
Michael Maclean e4e9eaef4c Minor fix to constants registered in ext/hash, and update NEWS 2010-03-23 23:39:09 +00:00
Michael Maclean d05ce25746 Add FNV-1 support to ext/hash 2010-03-23 22:21:39 +00:00
Sebastian Bergmann 9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00