Merge branch 'pull-request/412'

* pull-request/412:
  Create test to the extension xmlrpc
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Add -P option to use the current binary
  Create test to the extension xmlrpc
Merge branch 'PHP-5.5'

* PHP-5.5:
  Add -P option to use the current binary
  Create test to the extension xmlrpc
Merge branch 'pull-request/411'

* pull-request/411:
  Use pkg-config to detect iodbc
Use pkg-config to detect iodbc
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Use pkg-config to detect iodbc
Merge branch 'PHP-5.5'

* PHP-5.5:
  Use pkg-config to detect iodbc
Fixed #65225: PHP_BINARY incorrectly set
new for fix #65225
Merge branch 'pull-request/381'

* pull-request/381:
  Fixed #65225: PHP_BINARY incorrectly set
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  new for fix #65225
  Fixed #65225: PHP_BINARY incorrectly set
Merge branch 'PHP-5.5'

* PHP-5.5:
  new for fix #65225
  Fixed #65225: PHP_BINARY incorrectly set
add CVE-2011-4718
Merge branch 'PHP-5.5'

* PHP-5.5:
  add CVE-2011-4718
https://bugs.php.net/bug.php?id=64979
Use in preg_replace_callback() using variables by reference and test for bug #64979
Merge branch 'PHP-5.5'

* PHP-5.5:
  Use in preg_replace_callback() using variables by reference and test for bug #64979
  https://bugs.php.net/bug.php?id=64979
Fix for php bug #64802 includes test case
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix for php bug #64802 includes test case

Conflicts:
	ext/openssl/openssl.c
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix for php bug #64802 includes test case