delta/php-git.git/sapi/cli/tests, branch native-tls

Merge branch 'PHP-5.6'

2014-11-29T00:49:40+00:00

* PHP-5.6:
  fix test with readline on mac

Merge branch 'PHP-5.5' into PHP-5.6

2014-11-29T00:49:23+00:00

* PHP-5.5:
  fix test with readline on mac

fix test with readline on mac

2014-11-29T00:47:45+00:00

Merge branch 'PHP-5.6'

2014-09-27T00:18:54+00:00

Merge branch 'PHP-5.5' into PHP-5.6

2014-09-27T00:18:29+00:00

Merge branch 'PHP-5.4' into PHP-5.5

2014-09-27T00:17:52+00:00

This test should pass

2014-09-27T00:17:26+00:00

Merge branch 'master' into phpng

2014-07-08T07:32:29+00:00

* master:
  Fix still broken session test.  Only return true/false.
  Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
  Followup fix to custom session save handlers
  create locales and re-add test
  rm test for now

Conflicts:
	ext/session/tests/session_set_save_handler_class_012.phpt

Merge branch 'PHP-5.6'

2014-07-07T20:49:00+00:00

* PHP-5.6:
  Fixed bug #66830 (Empty header causes PHP built-in web server to hang).

Merge branch 'PHP-5.5' into PHP-5.6

2014-07-07T20:45:01+00:00

* PHP-5.5:
  Fixed bug #66830 (Empty header causes PHP built-in web server to hang).