Re: com php-src: Fix bug #61537 (json_encode() incorrectly truncates/discards information) and remove a test case that's now mooted by this fix.: NEWS
ext/json/json.c ext/json/php_json.h ext/json/tests/bug43941.phpt ext/json/tests/bug54058.

From: Date: Fri, 13 Apr 2012 01:17:41 +0000
Subject: Re: com php-src: Fix bug #61537 (json_encode() incorrectly truncates/discards information) and remove a test case that's now mooted by this fix.: NEWS
ext/json/json.c ext/json/php_json.h ext/json/tests/bug43941.phpt ext/json/tests/bug54058.
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-68765@lists.php.net to get a copy of this message
2012/4/12 Johannes Schlüter <johannes@schlueters.de>: > please make sure to merge things upwards. i see the patch was applied to > 5.4 and master, too, but git doesn't know about the merge. I thought I had, to be honest — there was a conflict on NEWS (not surprising), but I thought I'd resolved that properly. Any people with more git merging experience want to point to a guide to dealing with that sort of thing? I've used git for years, but I'm really having a hard time wrapping my head around the way we're using it, even with the guides on the Wiki. Adam

« previous php.cvs (#68765) next »