From: Stanislav Malyshev <stas@php.net>
Date: Mon, 23 Mar 2015 04:56:40 +0000 (-0700)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~533
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=081a812b4967d117a21c411769ac0bb5f543c0eb;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  oops, forgot TSRMLS_CC

Conflicts:
	ext/date/php_date.c
---

081a812b4967d117a21c411769ac0bb5f543c0eb
diff --cc ext/date/php_date.c
index 7855a5fb7b,b77dbba0cd..bc423d2663
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@@ -2846,7 -2926,7 +2846,7 @@@ PHP_METHOD(DateTime, createFromImmutabl
  	php_date_obj *new_obj = NULL;
  	php_date_obj *old_obj = NULL;
  
- 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "O!", &datetimeimmutable_object, date_ce_immutable) == FAILURE) {
 -	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &datetimeimmutable_object, date_ce_immutable) == FAILURE) {
++	if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &datetimeimmutable_object, date_ce_immutable) == FAILURE) {
  		return;
  	}