Fixed bug #68545 NULL pointer dereference in unserialize.c
move the test to the right place
update NEWS
Fixed memory leak introduced by 73458e8f
first shot remove TSRMLS_* things
Fix undefined behaviour in strnatcmp
Fix undefined behaviour in strnatcmp
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix undefined behaviour in strnatcmp
  update NEWS
  move the test to the right place
  Fixed bug #68545 NULL pointer dereference in unserialize.c

Conflicts:
	NEWS
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix undefined behaviour in strnatcmp
  update NEWS
  move the test to the right place
  Fixed bug #68545 NULL pointer dereference in unserialize.c
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix undefined behaviour in strnatcmp
  update NEWS
  move the test to the right place
  Fixed bug #68545 NULL pointer dereference in unserialize.c
fix typo
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix typo
second shot on removing TSRMLS_*
split fpm config to two parts. PR#903

main config = global options
secondary config = pool options

makes easier to add new pools:
duplicate pool config in fpm.d dir

https://bugs.php.net/bug.php?id=67106
almost all the replacements of TSRMLS_* are done

Some places have to be yet touched as they use different/custom
macros namings for the same. Also some places in the code became
redundant now, this is the next task. To name some: ext/mysqlnd,
sapi/embed, ext/curl and some smaller places here and there.
Fix bug #67106 split main fpm config
removed the TS part, as suggested by Dmitry.

Tests seem to be ok so far
Merge remote-tracking branch 'origin/master' into native-tls

* origin/master:
  Fix bug #67106 split main fpm config
  split fpm config to two parts. PR#903
  fix typo
  Fix undefined behaviour in strnatcmp
  Fix undefined behaviour in strnatcmp
  Fixed memory leak introduced by 73458e8f
  update NEWS
  move the test to the right place
  Fixed bug #68545 NULL pointer dereference in unserialize.c
Share HTTP status codes map
Merge branch 'unify_http'

* unify_http:
  Share HTTP status codes map