From: Stanislav Malyshev <stas@php.net>
Date: Mon, 17 Mar 2014 08:19:45 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~475^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2499b6518c4b0112c79295145d5f09d3658c31f4;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #66873: check if obj->src is set
---

2499b6518c4b0112c79295145d5f09d3658c31f4
diff --cc NEWS
index 8860fb4993,8a5cf73035..c5fbb6cd99
--- a/NEWS
+++ b/NEWS
@@@ -28,9 -26,13 +28,13 @@@ PH
    . Fixed bug #66893 (imagescale ignore method argument). (Remi)
  
  - Hash:
 -  . hash_pbkdf2() now works correctly if the $length argument is not specified.
 -    (Nikita)
 +  . Fixed bug #66698 (Missing FNV1a32 and FNV1a64 hash functions).
 +    (Michael M Slusarz).
  
+ - Intl:
 -  . Fixed bug #66873 (A reproductible crash in UConverter when given invalid 
++  . Fixed bug #66873 (A reproductible crash in UConverter when given invalid
+     encoding) (Stas)
+ 
  - Mail:
    . Fixed bug #66535 (Don't add newline after X-PHP-Originating-Script) (Tjerk)