delta/php-git.git/sapi/cli, branch php-7.0.3 git.php.net: repository/php-src.git Merge branch 'PHP-5.6' into PHP-7.0 2016-01-18T16:02:23+00:00 Anatol Belski ab@php.net 2016-01-18T16:02:23+00:00 71dbad172fad8612046dadbfd0536c759559e40d * PHP-5.6: fork test fix test fork test fork test for win32 fork test 
* PHP-5.6:
  fork test
  fix test
  fork test
  fork test for win32
  fork test
fix test 2016-01-18T15:52:48+00:00 Anatol Belski ab@php.net 2016-01-18T15:52:48+00:00 5673ede6e97d8268ff568e9869de88c8632d2011 






Merge branch 'PHP-5.6' into PHP-7.0
2016-01-04T17:13:38+00:00

Julien Pauli
jpauli@php.net

2016-01-04T17:13:38+00:00

736b91c6507b196e9ddd84aba3f98ee7ed66c63d

* PHP-5.6:
  Happy new year (Update copyright to 2016)

Conflicts:
	ext/json/php_json_encoder.h
	sapi/continuity/capi.c





* PHP-5.6:
  Happy new year (Update copyright to 2016)

Conflicts:
	ext/json/php_json_encoder.h
	sapi/continuity/capi.c







Happy new year (Update copyright to 2016)
2016-01-02T23:44:37+00:00

Lior Kaplan
kaplanlior@gmail.com

2016-01-01T23:44:37+00:00

53fb2f1e5c6037a5182c2e0dcd5bac7ecdb7c150












Happy new year (Update copyright to 2016)
2016-01-01T18:03:16+00:00

Lior Kaplan
kaplanlior@gmail.com

2016-01-01T17:49:07+00:00

2eb1f38d24bcd02f69bfcf7845f93563a42850d6












Merge branch 'PHP-5.6' into PHP-7.0
2016-01-01T17:48:25+00:00

Lior Kaplan
kaplanlior@gmail.com

2016-01-01T17:47:16+00:00

ed35de784f4ea53927e906ba4af335778de4d16a

* PHP-5.6:
  Happy new year (Update copyright to 2016)





* PHP-5.6:
  Happy new year (Update copyright to 2016)







Happy new year (Update copyright to 2016)
2016-01-01T17:21:47+00:00

Lior Kaplan
kaplanlior@gmail.com

2016-01-01T17:19:27+00:00

49493a2dcfb2cd1758b69b13d9006ead3be0e066












Added support for HTTP 451
2015-12-23T10:31:18+00:00

Julien Pauli
jpauli@php.net

2015-12-23T10:31:18+00:00

ea12ff149cdcfe04531c7114cf7a3b8e68cd074c












Fix bug #71005 (Segfault in php_cli_server_dispatch_router()).
2015-12-01T03:09:36+00:00

Adam Harvey
aharvey@php.net

2015-12-01T03:09:36+00:00

91bad929aa0d7b7560a20c58e1e02a76f522b0bd

We didn't initialise the retval variable in
php_cli_server_dispatch_router(); let's now initialise it to be
IS_UNDEF, as the following if condition expects.





We didn't initialise the retval variable in
php_cli_server_dispatch_router(); let's now initialise it to be
IS_UNDEF, as the following if condition expects.







Merge branch 'PHP-5.6' into PHP-7.0
2015-11-23T16:56:13+00:00

Lior Kaplan
kaplanlior@gmail.com

2015-11-23T16:56:13+00:00

9642710a0985f5cf1bf4e3762236439694f072d9

* PHP-5.6:
  Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_internal_extensions)

 Conflicts:
	sapi/cgi/config9.m4
	sapi/fpm/config.m4





* PHP-5.6:
  Fixed bug #61751 (SAPI build problem on AIX: Undefined symbol: php_register_internal_extensions)

 Conflicts:
	sapi/cgi/config9.m4
	sapi/fpm/config.m4