php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-21 23:18:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
73,553 Commits 549 Branches 1,484 Tags
b119836765a72700a07b004b95c92beffa3daf95
Commit Graph

608 Commits

Author SHA1 Message Date
Xinchen Hui b29a9fa75d Merge branch 'PHP-5.4' into PHP-5.5 2013-03-21 11:14:36 +08:00
Xinchen Hui 0fd3572f4e Fixed bug #64432 (more empty delimiter warning in strX methods) 2013-03-21 11:14:10 +08:00
Xinchen Hui 2413fa6fbb Fix test after the convert_to_long be improved, see #64290 2013-03-03 11:13:52 +08:00
Stanislav Malyshev deeacc7106 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix bug #63462 (Magic methods called twice for unset protected properties)
  NEWS for bug #64011. See 77ee200
  Fix bug #64011 (get_html_translation_table())
  Fix News
  Update the arguments in the prototype of fpm_socket_unix_test_connect().
  fixed build
  NEWS for bug #63893
  Fixed inconsequential bug in strtr()
  Revert "Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa."
  Revert "Update fputcsv() to escape all characters equally."
  Remove _GNU_SOURCE, add local heap sort
  The compiler can figure this out
  Remove unused block
  strtr() with 2nd param array - optimization
  Refactoring, bugs & leaks
  Optimize strtr w/ 2nd arg array
 2013-01-18 13:42:04 -08:00
Gustavo Lopes 77ee200097 Fix bug #64011 (get_html_translation_table()) 
get_html_translation_table() with encoding ISO-8859-1 and HTMLENTITIES
was broken. Only entities for characters U+0000 to U+0040 were being
included in the result.
 2013-01-18 12:10:27 +01:00
Remi Collet b3a934bdb3 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle) See commit c05ee74e7f
 2013-01-10 11:18:25 +01:00
Remi Collet f659ec108f Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle) See commit c05ee74e7f
 2013-01-10 11:17:53 +01:00
Remi Collet dc9f0e70b7 Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle) 
See commit c05ee74e7f
 2013-01-10 11:14:38 +01:00
Xinchen Hui 6deb8361f3 Merge branch 'PHP-5.4' into PHP-5.5 2013-01-09 10:57:47 +08:00
Xinchen Hui 15aaa9c660 Merge branch 'PHP-5.3' into PHP-5.4 2013-01-09 10:54:23 +08:00
Xinchen Hui c05ee74e7f Fixed bug #63943 (Bad warning text from strpos() on empty needle) 2013-01-09 10:53:20 +08:00
Pierrick Charron 8228597ecc Fixed bug #63874 (Segfaul if php_strip_whitespace has heredoc) 
T_END_HEREDOC don't carry a token value anymore since commit 4cf90e06c
Bugfix by Nikita for bug #60097
 2012-12-29 23:11:37 -05:00
Remi Collet 4d8d5d83fc Fixed Bug #63738 unpack: back result with Z format 
Fix result for empty string.
Same output as perl
perl -e 'print unpack("Z2","\0\0");' => ""
perl -e 'print unpack("Z2","A\0");'  => "A"
perl -e 'print unpack("Z2","AB\0");' => "AB"
perl -e 'print unpack("Z2","ABC\0");'=> "AB"
 2012-12-11 16:30:08 +01:00
Xinchen Hui 610c7fbe7b Remove executable permission on phpt 2012-10-10 10:27:49 +08:00
Xinchen Hui e081c55fb5 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:31:31 +08:00
Xinchen Hui 4b152e5470 Merge branch 'PHP-5.4' 2012-10-10 10:32:38 +08:00
Lars Strojny 6793e09a4e Merge branch 'PHP-5.4' 2012-09-18 23:17:31 +02:00
Lars Strojny ee172ce3cc Merging PR #116 2012-09-18 23:15:03 +02:00
Lars Strojny aaa2eee4c0 Bug 62462: adjusting test 2012-08-21 10:09:05 +02:00
Lars Strojny a45e81d093 Bug 62462: adjusting test 2012-08-21 10:08:46 +02:00
Lars Strojny 18bb426587 Bug 62462: Prevent multibyte characters from being split between the lines 
Merged from https://github.com/php/php-src/pull/120
 2012-08-20 23:47:20 +02:00
Lars Strojny c54d73d54c Bug 62462: Prevent multibyte characters from being split between the lines 
Merged from https://github.com/php/php-src/pull/120
 2012-08-20 23:46:50 +02:00
Xinchen Hui dacd918dc7 Merge branch 'PHP-5.4' 2012-08-14 14:03:56 +08:00
Xinchen Hui 8091256948 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-14 14:03:05 +08:00
Reeze Xia 0239437903 Skip tests reply on Zend MM turned on 
Those two tests have expect memory exhausted fatal error
 2012-08-11 00:34:37 +08:00
Stanislav Malyshev 6bfea28ce3 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixing up closing tag
  Testing variation on input parameters of http_build_query() function
 2012-07-14 19:00:35 -07:00
Adam Gegotek 8b70dd202a Fixing up closing tag 2012-07-14 18:59:04 -07:00
Adam Gegotek 152f73f92a Testing variation on input parameters of http_build_query() function 2012-07-14 18:58:52 -07:00
Anthony Ferrara 63318772ae Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed Salt)
 2012-06-28 20:38:31 -04:00
Anthony Ferrara 34ab5650bc Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed Salt)
 2012-06-28 20:36:21 -04:00
Anthony Ferrara 7e8276ca68 Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed Salt) 
Fixed a memory allocation bug in crypt() SHA256/512 that can
cause segmentation faults when passed in salts with a null byte
early.
 2012-06-28 20:00:03 -04:00
Stanislav Malyshev f428578138 Merge branch 'PHP-5.4' 
* PHP-5.4:
  fix CVE-2012-2143
 2012-05-29 23:14:09 -07:00
Stanislav Malyshev 692b3bcd88 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fix CVE-2012-2143
 2012-05-29 23:08:04 -07:00
Stanislav Malyshev aab49e934d fix CVE-2012-2143 2012-05-29 23:07:04 -07:00
zoe slattery 129c830562 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Changes to remaining two tests, #62022
 2012-05-15 14:40:49 +01:00
zoe slattery 63401268db Changes to remaining two tests, #62022 2012-05-15 14:39:51 +01:00
Gustavo André dos Santos Lopes d77cde46e1 Merge branch '5.4' 2012-04-23 22:10:50 +01:00
Gustavo André dos Santos Lopes 485638a09c Merge branch '5.3' into 5.4 2012-04-23 22:10:23 +01:00
Gustavo André dos Santos Lopes 8d748e5de5 Fixed bug #61764: 'I' unpacks n as signed if n > 2^31-1 on LP64 
Also fixed possible invalid read on big endian LP64.
 2012-04-23 22:09:38 +01:00
Gustavo André dos Santos Lopes dbc5b42435 pack() with new "Z" more in line with Perl. 
Made pack() with "Z" force NUL termination, even if it mean truncating input
to less than the number of characters specified and if the number of
characters is "*", the output will be one byte larger than the input.

Improved tests.
 2012-04-17 22:21:32 +01:00
theanomaly.is@gmail.com 4968fa644b Fixed bug #61038; "Z" and better behavior for unpack() 
Added new "Z" argument to pack/unpack, now allowing "a" to return
data without stripping, and "A" strips all trailing white space,
while "Z" will strip everything after the first null.
 2012-04-17 21:09:04 +01:00
Nikita Popov 8ac56c15c9 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #61660: bin2hex(hex2bin($data)) != $data
 2012-04-08 22:41:04 +02:00
Nikita Popov 7ae93a2c4c Fix bug #61660: bin2hex(hex2bin($data)) != $data 
If the input data has an odd length a warning is thrown and false is returned.
 2012-04-08 22:38:21 +02:00
Gustavo André dos Santos Lopes efc94f3115 - Fixed bug #61374: html_entity_decode tries to decode code points that don't 
exist in ISO-8859-1.
 2012-03-13 18:08:30 +00:00
Gustavo André dos Santos Lopes ed98579924 - Fixed bug #61374: html_entity_decode tries to decode code points that don't 
exist in ISO-8859-1.
 2012-03-13 18:08:30 +00:00
Rasmus Lerdorf bc8e8b3467 Fix tests that break if filter.default isn't set to unsafe_raw 2012-03-02 05:04:40 +00:00
Rasmus Lerdorf f564921c15 Fix tests that break if filter.default isn't set to unsafe_raw 2012-03-02 05:04:40 +00:00
Adam Harvey 03f3d03ce0 MFH: Fix bug #60801 (strpbrk() mishandles NUL byte). (Trunk commit: r322934). 2012-03-02 03:39:04 +00:00
Adam Harvey 4fc6861030 MFH: Fix bug #60801 (strpbrk() mishandles NUL byte). (Trunk commit: r322934). 2012-03-02 03:39:04 +00:00
Rasmus Lerdorf 4ed1640b35 This one depends on max_input_vars as well 2012-02-14 09:50:46 +00:00