Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix #70096: Repeated iptcembed() adds superfluous FF bytes

Conflicts:
	ext/standard/iptc.c

diff --cc ext/standard/iptc.c
index 4554be32db32ed1e2a0208a2abc6f0288ae098d6,169ee96d35cb1ecfaecb1e8beb6cf45eef6fedc0..c47f2c21332d0eceecedd9815e7f076fe2bc39d2
--- 1/ext/standard/iptc.c
--- 2/ext/standard/iptc.c
+++ b/ext/standard/iptc.c
@@@ -237,8 -235,9 +237,9 @@@ PHP_FUNCTION(iptcembed
                switch (marker) {
                        case M_APP13:
                                /* we are going to write a new APP13 marker, so don't output the old one */
 -                              php_iptc_skip_variable(fp, 0, 0 TSRMLS_CC);    
 +                              php_iptc_skip_variable(fp, 0, 0);
+                               fgetc(fp); /* skip already copied 0xFF byte */
 -                              php_iptc_read_remaining(fp, spool, poi?&poi:0 TSRMLS_CC);
 +                              php_iptc_read_remaining(fp, spool, poi?&poi:0);
                                done = 1;
                                break;