Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix #66606: Sets HTTP_CONTENT_TYPE but not CONTENT_TYPE
  added tests for bug #66606

diff --cc sapi/cli/php_cli_server.c
index f76199af9aafd6de39f9dec2f63a996f3f9f6f17,00226782de4086f84d366d9daee0b04a65a1fc96..9c00fa0bdfe5752c531a8ecce4f29099e54bf981
--- 1/sapi/cli/php_cli_server.c
--- 2/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@@ -604,7 -732,10 +604,10 @@@ static int sapi_cli_server_register_ent
                        }
                }
                spprintf(&real_key, 0, "%s_%s", "HTTP", key);
 -                      sapi_cli_server_register_variable(track_vars_array, key, *entry TSRMLS_CC);
+               if (strcmp(key, "CONTENT_TYPE") == 0 || strcmp(key, "CONTENT_LENGTH") == 0) {
 -              sapi_cli_server_register_variable(track_vars_array, real_key, *entry TSRMLS_CC);
++                      sapi_cli_server_register_variable(track_vars_array, key, *entry);
+               }
 +              sapi_cli_server_register_variable(track_vars_array, real_key, *entry);
                efree(key);
                efree(real_key);
        }