Patch peclsolr.patch for solr Bug #59808

Patch version 2011-10-13 14:18 UTC

• 2011-10-13 14:18 UTC [diff to current]

Developer: alex@discardmail.com

--- solr_functions_helpers.c.old	2011-10-13 15:48:59.000000000 +0200
+++ solr_functions_helpers.c.new	2011-10-13 15:50:57.000000000 +0200
@@ -20,7 +20,9 @@
 
 #include "php_solr.h"
 
-ZEND_EXTERN_MODULE_GLOBALS(json)
+#if !(PHP_MAJOR_VERSION==5 && PHP_MINOR_VERSION==2)
+	ZEND_EXTERN_MODULE_GLOBALS(json)
+#endif
 
 /** ************************************************************************ **/
 /** FUNCTIONS FOR DECLARING CONSTANTS                                        **/
@@ -1120,7 +1122,11 @@
 
 	ZVAL_STRINGL(&json_last_error_function_name, "json_last_error", sizeof("json_last_error"), 0);
 
-	php_json_decode(&json_decode_ret_val, (char *) json_string, json_string_length, 1, recursion_depth TSRMLS_CC);
+	#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, recursion_depth TSRMLS_CC);
+	#endif
 
 	call_user_function(global_function_table, object_pp, &json_last_error_function_name, &json_last_error_ret_val, 0, json_last_error_params TSRMLS_CC);