Re-fixed bug #66469
Fixed previous commit may delete unwanted cookies. Sync tests from upper branches.
Fixed previous commit may delete unwanted cookies.
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed previous commit may delete unwanted cookies.
  Re-fixed bug #66469
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed previous commit may delete unwanted cookies. Sync tests from upper branches.
  Re-fixed bug #66469
fixed missing usleep() prototype in pgsql
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fixed missing usleep() prototype in pgsql
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fixed missing usleep() prototype in pgsql
Merge branch 'PHP-5.6'

* PHP-5.6:
  fixed missing usleep() prototype in pgsql
Merge remote-tracking branch 'origin/master' into str_size_and_int64
fix zts
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix zts
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix zts
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix zts
renamed the compat macros
after merge fix ext\session
fixed test
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fixed test
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fixed test
Merge branch 'PHP-5.6'

* PHP-5.6:
  fixed test