Merge branch 'PHP-5.5'

* PHP-5.5:
  - fix the fix for bug #50524
- NEWS entry for #50524
fix different values of mysqli_stmt_affected_rows between libmysql
and mysqlnd (in favor of libmysql) before execute and after prepare()
Merge branch 'PHP-5.5'

Conflicts:
	NEWS
sapi/litespeed/lsapi_main.c: Fix bug #63228

Fix compiling error at line 606 (error: format not a string
literal and no format arguments [-Werror=format-security]
Add NEWS for the previously cherry picked commit.
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Add NEWS for the previously cherry picked commit.
  sapi/litespeed/lsapi_main.c: Fix bug #63228

Conflicts:
	sapi/litespeed/lsapi_main.c
Merge branch 'PHP-5.5'

* PHP-5.5:
  Add NEWS for the previously cherry picked commit.
  sapi/litespeed/lsapi_main.c: Fix bug #63228
- fix bug #47358, glob returns error, should be empty array()
- fix bug #47358, glob returns error, should be empty array()
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - fix bug #47358, glob returns error, should be empty array()
  - NEWS entry for #50524
Merge branch 'PHP-5.5'

* PHP-5.5:
  - fix bug #47358, glob returns error, should be empty array()
  - NEWS entry for #50524
Merge branch 'master' of git.php.net:php-src
Fix a typo in the ZipArchive error messages
Fixed bug #63943 (Bad warning text from strpos() on empty needle)
Merge branch 'PHP-5.3' into PHP-5.4
update NEWS
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5'
Fixed bug #63882 (zend_std_compare_objects crash on recursion)