[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pecl-cvs
Subject:    [PECL-CVS] =?utf-8?q?svn:_/pecl/solr/trunk/_solr=5Ffunctions=5Fhelpers.c?=
From:       Pierrick_Charron <pierrick () php ! net>
Date:       2011-11-28 19:19:09
Message-ID: svn-pierrick-1322507949-320129-1056671292 () svn ! php ! net
[Download RAW message or body]

pierrick                                 Mon, 28 Nov 2011 19:19:09 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=320129

Log:
PHP5.2 dont have recursion_depth

Changed paths:
    U   pecl/solr/trunk/solr_functions_helpers.c

Modified: pecl/solr/trunk/solr_functions_helpers.c
===================================================================
--- pecl/solr/trunk/solr_functions_helpers.c	2011-11-28 18:45:29 UTC (rev 320128)
+++ pecl/solr/trunk/solr_functions_helpers.c	2011-11-28 19:19:09 UTC (rev 320129)
@@ -1090,9 +1090,10 @@
 /* {{{ PHP_SOLR_API int solr_json_to_php_native(solr_string_t *buffer, const \
solr_char_t *json_string, int json_string_length TSRMLS_DC) */  PHP_SOLR_API int \
solr_json_to_php_native(solr_string_t *buffer, const solr_char_t *json_string, int \
json_string_length TSRMLS_DC)  {
+#if !(PHP_MAJOR_VERSION==5 && PHP_MINOR_VERSION==2)
 	/* JSON recursion depth. default is 512 */
 	long recursion_depth = 1024L;
-
+#endif
 	long json_error = 0L;

 	php_serialize_data_t var_hash;
@@ -1123,8 +1124,8 @@
 	ZVAL_STRINGL(&json_last_error_function_name, "json_last_error", \
sizeof("json_last_error"), 0);

 #if PHP_MAJOR_VERSION==5 && PHP_MINOR_VERSION==2
-		php_json_decode(&json_decode_ret_val, (char *) json_string, json_string_length, \
                recursion_depth TSRMLS_CC);
-#elif
+		php_json_decode(&json_decode_ret_val, (char *) json_string, json_string_length, 1 \
TSRMLS_CC); +#else
 		php_json_decode(&json_decode_ret_val, (char *) json_string, json_string_length, 1, \
recursion_depth TSRMLS_CC);  #endif



-- 
PECL CVS Mailing List 
To unsubscribe, visit: http://www.php.net/unsub.php

[prev in list] [next in list] [prev in thread] [next in thread]