Fixed bugs #47675 and #64577 (fd leak on Solaris)
fixed EOL
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fixed EOL
Merge branch 'PHP-5.5'

* PHP-5.5:
  fixed EOL
fix memory leak at apprentice.c:1095
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix memory leak at apprentice.c:1095
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix memory leak at apprentice.c:1095
Refactored the previous memleak fix

to avoid usage of a freed pointer. Thanks Laruence )
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Refactored the previous memleak fix
Merge branch 'PHP-5.5'

* PHP-5.5:
  Refactored the previous memleak fix
fix ident
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix ident
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix ident
updated libmagic.patch
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated libmagic.patch
Merge branch 'PHP-5.5'

* PHP-5.5:
  updated libmagic.patch
fix some unitialized values and typo
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix some unitialized values and typo
Merge branch 'master' of git.php.net:php-src
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5