5.5.16 now
fix unstable test
5.4.31
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.31
  fix unstable test

Conflicts:
	configure.in
	main/php_version.h
Fixed typo in Makefile.frag
Fixed typo in Makefile.frag
turn off PGO in phpize mode
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  turn off PGO in phpize mode
  Fixed typo in Makefile.frag
Update LiteSpeed SAPI code to V6.4

Conflicts:
	sapi/litespeed/lsapi_main.c
	sapi/litespeed/lsapidef.h
	sapi/litespeed/lsapilib.c
	sapi/litespeed/lsapilib.h
update to LSAPI 6.6

Conflicts:
	sapi/litespeed/lsapi_main.c
Do not kill children process in pre-fork mode when parent process quit.
cleanup file headers.
Update LiteSpeed SAPI code to V6.4

Conflicts:
	sapi/litespeed/lsapi_main.c
	sapi/litespeed/lsapidef.h
	sapi/litespeed/lsapilib.c
	sapi/litespeed/lsapilib.h

Conflicts:
	sapi/litespeed/lsapi_main.c
	sapi/litespeed/lsapilib.c
	sapi/litespeed/lsapilib.h
update to LSAPI 6.6

Conflicts:
	sapi/litespeed/lsapi_main.c
Do not kill children process in pre-fork mode when parent process quit.
cleanup file headers.
force ext_dep.js prepend to configure.js in phpize mode
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  force ext_dep.js prepend to configure.js in phpize mode
  cleanup file headers.
  Do not kill children process in pre-fork mode when parent process quit.
  update to LSAPI 6.6
  Update LiteSpeed SAPI code to V6.4
fix end of stream exception when generating makefile
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix end of stream exception when generating makefile