Attachment #304865 for bug #407441

View | Details | Raw Unified | Return to bug 407441
Collapse All | Expand All




			mmc_server_free(mmc TSRMLS_CC);
			mmc = NULL;
		} else {
			MEMCACHE_LIST_INSERT(mmc, le_memcache_server);
		}
	}
	else if (le->type != le_memcache_server || le->ptr == NULL) {

			mmc = NULL;
		}
		else {
			MEMCACHE_LIST_INSERT(mmc, le_memcache_server);
		}
	}
	else {

	if (zend_hash_find(Z_OBJPROP_P(mmc_object), "connection", sizeof("connection"), (void **)&connection) == FAILURE) {
		pool = mmc_pool_new(TSRMLS_C);
		pool->failure_callback = &php_mmc_failure_callback;
		list_id = MEMCACHE_LIST_INSERT(pool, le_memcache_pool);
		add_property_resource(mmc_object, "connection", list_id);
	}
	else {

		int list_id;
		mmc_pool_t *pool = mmc_pool_new(TSRMLS_C);
		pool->failure_callback = &php_mmc_failure_callback;
		list_id = MEMCACHE_LIST_INSERT(pool, le_memcache_pool);
		mmc_object = return_value;
		object_init_ex(mmc_object, memcache_ce);
		add_property_resource(mmc_object, "connection", list_id);


	/* check for userspace callback */
	if (param != NULL && zend_hash_find(Z_OBJPROP_P((zval *)param), "_failureCallback", sizeof("_failureCallback"), (void **)&callback) == SUCCESS && Z_TYPE_PP(callback) != IS_NULL) {
		if (MEMCACHE_IS_CALLABLE(*callback, 0, NULL)) {
			zval *retval = NULL;
			zval *host, *tcp_port, *udp_port, *error, *errnum;
			zval **params[5];

	}

	if (failure_callback != NULL && Z_TYPE_P(failure_callback) != IS_NULL) {
		if (!MEMCACHE_IS_CALLABLE(failure_callback, 0, NULL)) {
			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid failure callback");
			RETURN_FALSE;
		}

	}

	if (failure_callback != NULL && Z_TYPE_P(failure_callback) != IS_NULL) {
		if (!MEMCACHE_IS_CALLABLE(failure_callback, 0, NULL)) {
			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid failure callback");
			RETURN_FALSE;
		}

	}

	if (Z_TYPE_P(failure_callback) != IS_NULL) {
		if (!MEMCACHE_IS_CALLABLE(failure_callback, 0, NULL)) {
			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid failure callback");
			RETURN_FALSE;
		}

Lines 156-164 Link Here

(-)php_memcache.h (-2 / +8 lines)
156	ZEND_END_MODULE_GLOBALS(memcache)	156	ZEND_END_MODULE_GLOBALS(memcache)
157		157
158	#if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION >= 3)	158	#if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION >= 3)
159	# define IS_CALLABLE(cb_zv, flags, cb_sp) zend_is_callable((cb_zv), (flags), (cb_sp) TSRMLS_CC)	159	# define MEMCACHE_IS_CALLABLE(cb_zv, flags, cb_sp) zend_is_callable((cb_zv), (flags), (cb_sp) TSRMLS_CC)
160	#else	160	#else
161	# define IS_CALLABLE(cb_zv, flags, cb_sp) zend_is_callable((cb_zv), (flags), (cb_sp))	161	# define MEMCACHE_IS_CALLABLE(cb_zv, flags, cb_sp) zend_is_callable((cb_zv), (flags), (cb_sp))
		162	#endif
		163
		164	#if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION >= 4)
		165	# define MEMCACHE_LIST_INSERT(item, list) zend_list_insert(item, list TSRMLS_CC);
		166	#else
		167	# define MEMCACHE_LIST_INSERT(item, list) zend_list_insert(item, list);
162	#endif	168	#endif
163		169
164	/* internal functions */	170	/* internal functions */

Return to bug 407441

Lines 718-724 Link Here

(-)memcache.c (-8 / +8 lines)
718	mmc_server_free(mmc TSRMLS_CC);	718	mmc_server_free(mmc TSRMLS_CC);
719	mmc = NULL;	719	mmc = NULL;
720	} else {	720	} else {
721	zend_list_insert(mmc, le_memcache_server);	721	MEMCACHE_LIST_INSERT(mmc, le_memcache_server);
722	}	722	}
723	}	723	}
724	else if (le->type != le_memcache_server \|\| le->ptr == NULL) {	724	else if (le->type != le_memcache_server \|\| le->ptr == NULL) {
Lines 735-741 Link Here
735	mmc = NULL;	735	mmc = NULL;
736	}	736	}
737	else {	737	else {
738	zend_list_insert(mmc, le_memcache_server);	738	MEMCACHE_LIST_INSERT(mmc, le_memcache_server);
739	}	739	}
740	}	740	}
741	else {	741	else {
Lines 775-781 Link Here
775	if (zend_hash_find(Z_OBJPROP_P(mmc_object), "connection", sizeof("connection"), (void **)&connection) == FAILURE) {	775	if (zend_hash_find(Z_OBJPROP_P(mmc_object), "connection", sizeof("connection"), (void **)&connection) == FAILURE) {
776	pool = mmc_pool_new(TSRMLS_C);	776	pool = mmc_pool_new(TSRMLS_C);
777	pool->failure_callback = &php_mmc_failure_callback;	777	pool->failure_callback = &php_mmc_failure_callback;
778	list_id = zend_list_insert(pool, le_memcache_pool);	778	list_id = MEMCACHE_LIST_INSERT(pool, le_memcache_pool);
779	add_property_resource(mmc_object, "connection", list_id);	779	add_property_resource(mmc_object, "connection", list_id);
780	}	780	}
781	else {	781	else {
Lines 836-842 Link Here
836	int list_id;	836	int list_id;
837	mmc_pool_t *pool = mmc_pool_new(TSRMLS_C);	837	mmc_pool_t *pool = mmc_pool_new(TSRMLS_C);
838	pool->failure_callback = &php_mmc_failure_callback;	838	pool->failure_callback = &php_mmc_failure_callback;
839	list_id = zend_list_insert(pool, le_memcache_pool);	839	list_id = MEMCACHE_LIST_INSERT(pool, le_memcache_pool);
840	mmc_object = return_value;	840	mmc_object = return_value;
841	object_init_ex(mmc_object, memcache_ce);	841	object_init_ex(mmc_object, memcache_ce);
842	add_property_resource(mmc_object, "connection", list_id);	842	add_property_resource(mmc_object, "connection", list_id);
Lines 986-992 Link Here
986		986
987	/* check for userspace callback */	987	/* check for userspace callback */
988	if (param != NULL && zend_hash_find(Z_OBJPROP_P((zval )param), "_failureCallback", sizeof("_failureCallback"), (void *)&callback) == SUCCESS && Z_TYPE_PP(callback) != IS_NULL) {	988	if (param != NULL && zend_hash_find(Z_OBJPROP_P((zval )param), "_failureCallback", sizeof("_failureCallback"), (void *)&callback) == SUCCESS && Z_TYPE_PP(callback) != IS_NULL) {
989	if (IS_CALLABLE(*callback, 0, NULL)) {	989	if (MEMCACHE_IS_CALLABLE(*callback, 0, NULL)) {
990	zval *retval = NULL;	990	zval *retval = NULL;
991	zval host, tcp_port, udp_port, error, *errnum;	991	zval host, tcp_port, udp_port, error, *errnum;
992	zval **params[5];	992	zval **params[5];
Lines 1213-1219 Link Here
1213	}	1213	}
1214		1214
1215	if (failure_callback != NULL && Z_TYPE_P(failure_callback) != IS_NULL) {	1215	if (failure_callback != NULL && Z_TYPE_P(failure_callback) != IS_NULL) {
1216	if (!IS_CALLABLE(failure_callback, 0, NULL)) {	1216	if (!MEMCACHE_IS_CALLABLE(failure_callback, 0, NULL)) {
1217	php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid failure callback");	1217	php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid failure callback");
1218	RETURN_FALSE;	1218	RETURN_FALSE;
1219	}	1219	}
Lines 1275-1281 Link Here
1275	}	1275	}
1276		1276
1277	if (failure_callback != NULL && Z_TYPE_P(failure_callback) != IS_NULL) {	1277	if (failure_callback != NULL && Z_TYPE_P(failure_callback) != IS_NULL) {
1278	if (!IS_CALLABLE(failure_callback, 0, NULL)) {	1278	if (!MEMCACHE_IS_CALLABLE(failure_callback, 0, NULL)) {
1279	php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid failure callback");	1279	php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid failure callback");
1280	RETURN_FALSE;	1280	RETURN_FALSE;
1281	}	1281	}
Lines 1340-1346 Link Here
1340	}	1340	}
1341		1341
1342	if (Z_TYPE_P(failure_callback) != IS_NULL) {	1342	if (Z_TYPE_P(failure_callback) != IS_NULL) {
1343	if (!IS_CALLABLE(failure_callback, 0, NULL)) {	1343	if (!MEMCACHE_IS_CALLABLE(failure_callback, 0, NULL)) {
1344	php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid failure callback");	1344	php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid failure callback");
1345	RETURN_FALSE;	1345	RETURN_FALSE;
1346	}	1346	}