Re: com php-src: Merge branch 'PHP-5.3' into PHP-5.4: configure.in ext/soap/php_http.c

On Sat, Mar 24, 2012 at 17:20, Hannes Magnusson <bjori@php.net> wrote: > Commit:    7a1c76538541e74719faf2311d72a70acd3c01e4 > Author:    Hannes Magnusson <bjori@php.net>         Sat, 24 Mar 2012 17:20:14 +0100 > Parents:   69b647c43be5729337024abdc6bf8565a1aa9a5b 4fc4dd8760ddd8a53df9b59921093cc6b523154e > Branches:  PHP-5.4 master > > Link:       > http://git.php.net/?p=php-src.git;a=commitdiff;h=7a1c76538541e74719faf2311d72a70acd3c01e4 > > Log: > Merge branch 'PHP-5.3' into PHP-5.4 > > * PHP-5.3: >  This is a git checkout >  Revert incorrect fix > > Changed paths: >  MM  configure.in >  MM  ext/soap/php_http.c I only touched bison error message line in configure.in.. I don't know where the rest of the billion line changes from configure.in came from (I did as the workflow wiki recommends; git merge --no-ff --log PHP-5.3). As for the "revert incorrect fix" commit, it looks like ilia only reverted it in the 5.3 branch, forgetting the others - don't know if that was intentional? I'm a bit unsure if I fckd stuff up here, if the mails are just weird (and the attached gigantic patch), or the wiki is simply wrong. David & Alexendar, could you please check it out? -Hannes