Commit Graph

5 Commits

Author SHA1 Message Date
Lior Kaplan
2eb1f38d24 Happy new year (Update copyright to 2016) 2016-01-01 20:03:16 +02:00
Julien Pauli
b2ecac9250 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Added support for HTTP 451

Conflicts:
	sapi/cgi/cgi_main.c
	sapi/cli/php_cli_server.c
	sapi/fpm/fpm/fpm_main.c
2015-12-23 11:36:36 +01:00
Adil Ilhan
c9c2794fe6 HTTP 506 status code added.
HTTP 506 status code added in main http status codes file. Reference: RFC 2295
2015-05-12 14:08:17 +02:00
Xinchen Hui
fc33f52d8c bump year 2015-01-15 23:27:30 +08:00
Andrea Faulds
e20cbdbe97 Unify HTTP status code maps 2014-12-21 03:12:39 +00:00