Happy New Year~
Merge branch 'PHP-5.3' into PHP-5.4
Happy New Year
Merge branch 'PHP-5.3' into PHP-5.4
Happy New Year
Merge branch 'PHP-5.4' into PHP-5.5
Happy New Year
Merge branch 'PHP-5.5'
Remove passwd handler from struct when not needed

CURLOPT_PASSWDFUNCTION was removed in cURL 7.15.5, the passwd field
will not be used for version greater than this one
Merge branch 'PHP-5.5'

* PHP-5.5:
  Remove passwd handler from struct when not needed
fix NEWS
Bug #43177: If an eval() has a parse error, the overall exit status and return code should not be affected.

Without this fix, a webpage using eval() may return code 500.  That might display
fine and the 500 go unnoticed, but using AJAX or wget, the 500 will cause problems.
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Bug #43177: If an eval() has a parse error, the overall exit status and return code should not be affected.
  fix NEWS

Conflicts:
	main/main.c
Merge branch 'PHP-5.5'

* PHP-5.5:
  Bug #43177: If an eval() has a parse error, the overall exit status and return code should not be affected.
  fix NEWS
add fix #43177
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  add fix #43177
Merge branch 'PHP-5.5'

* PHP-5.5:
  add fix #43177
add bug #63762
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  add bug #63762
Merge branch 'PHP-5.5'

* PHP-5.5:
  add bug #63762