<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0c833a8b3cc9f2e022d590977742fee132861ff7">https://github.com/macports/macports-ports/commit/0c833a8b3cc9f2e022d590977742fee132861ff7</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 0c833a8 php-solr: Add php74 support to 2.5.0 using patch
</span>0c833a8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0c833a8b3cc9f2e022d590977742fee132861ff7
</span>Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
AuthorDate: Sun May 10 11:23:12 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> php-solr: Add php74 support to 2.5.0 using patch
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Notes:
</span><span style='display:block; white-space:pre;color:#404040;'> - It adds a patch file that is 99.99% https://github.com/php/pecl-search_engine-solr/pull/18
</span><span style='display:block; white-space:pre;color:#404040;'> (but with travis, unrelated, and config.w32, conflicting and not used by us, changes taken apart).
</span><span style='display:block; white-space:pre;color:#404040;'> - Note I don't know much about the Portfile syntax, so that condition
</span><span style='display:block; white-space:pre;color:#404040;'> was the only way I found to apply the patch only for 7.4.
</span><span style='display:block; white-space:pre;color:#404040;'> - With the patch applied and the extension installed, we are getting a
</span><span style='display:block; white-space:pre;color:#404040;'> pass running our (moodle) unit tests. So it seems to work.
</span><span style='display:block; white-space:pre;color:#404040;'> - Cannot say much else, :-)
</span>---
php/php-solr/Portfile | 5 +-
php/php-solr/files/php74.patch | 341 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 345 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/php/php-solr/Portfile b/php/php-solr/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cdc53ca..f33d22c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/php/php-solr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/php/php-solr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ license PHP-3.01
</span> platforms darwin
maintainers {ryandesign @ryandesign} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4
</span> php.pecl yes
if {[vercmp ${php.branch} 7.0] >= 0} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,6 +18,9 @@ if {[vercmp ${php.branch} 7.0] >= 0} {
</span> checksums rmd160 443f928a76d2fdb2d22a34b030a2451d9c115dc4 \
sha256 f34c6159515bf229a6f72aab374c40d8dfc9c51d74f0d11fe30a611cbdb5c546 \
size 721839
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${php.branch} 7.4] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append php74.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> } elseif {[vercmp ${php.branch} 5.3] >= 0} {
version 2.4.0
revision 1
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/php/php-solr/files/php74.patch b/php/php-solr/files/php74.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..fae0a40
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/php/php-solr/files/php74.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,341 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build on PHP 7.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/php/pecl-search_engine-solr/pull/18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git pecl-compat/src/zend_hash.h pecl-compat/src/zend_hash.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ccec116e16c..2331aa5bfa1 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pecl-compat/src/zend_hash.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pecl-compat/src/zend_hash.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -289,8 +289,8 @@ static zend_always_inline int compat_zend_hash_get_current_key_ex(const HashTabl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int status;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *str;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint str_length;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ulong num;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t str_length;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ zend_ulong num;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ status = zend_hash_get_current_key_ex(ht, &str, &str_length, &num, 0, pos);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (status == HASH_KEY_IS_STRING) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -311,8 +311,8 @@ static zend_always_inline int compat_zend_hash_str_get_current_key_ex(const Hash
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ , zend_bool duplicate, HashPosition *pos)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int status;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint length;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ulong num;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t length;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ zend_ulong num;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ status = zend_hash_get_current_key_ex(ht, str_index, &length, &num, duplicate, pos);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (status == HASH_KEY_IS_STRING) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/php7/php_solr.c src/php7/php_solr.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b99b650d404..c0febc1306d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/php7/php_solr.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/php7/php_solr.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1296,7 +1296,7 @@ PHP_RINIT_FUNCTION(solr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zend_bool persistent = SOLR_HASHTABLE_PERSISTENT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Initial size of the HashTable */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint nSize = SOLR_INITIAL_HASH_TABLE_SIZE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t nSize = SOLR_INITIAL_HASH_TABLE_SIZE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ALLOC_HASHTABLE(SOLR_GLOBAL(documents));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ALLOC_HASHTABLE(SOLR_GLOBAL(clients));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/php7/php_solr_collapse_function.c src/php7/php_solr_collapse_function.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5bcf6436d49..44d34f182bd 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/php7/php_solr_collapse_function.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/php7/php_solr_collapse_function.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,7 +24,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PHP_METHOD(SolrCollapseFunction, __construct)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long int index = SOLR_UNIQUE_FUNCTION_INDEX();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint nSize = SOLR_INITIAL_HASH_TABLE_SIZE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t nSize = SOLR_INITIAL_HASH_TABLE_SIZE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ solr_function_t *solr_function_dest = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zval *objptr = getThis();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef PHP_7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/php7/php_solr_document.c src/php7/php_solr_document.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index be4748ee55e..158130ba233 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/php7/php_solr_document.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/php7/php_solr_document.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -475,7 +475,7 @@ static int solr_unserialize_document_object(solr_document_t *doc_entry, char *se
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PHP_METHOD(SolrDocument, __construct)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zval *objptr = getThis();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ulong document_index = SOLR_UNIQUE_DOCUMENT_INDEX();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ zend_ulong document_index = SOLR_UNIQUE_DOCUMENT_INDEX();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (solr_init_document(document_index) == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -742,7 +742,7 @@ PHP_METHOD(SolrDocument, current)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PHP_METHOD(SolrDocument, key)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ solr_document_t *doc_entry = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ulong num_index = 0L;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ zend_ulong num_index = 0L;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HashTable *doc_fields = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zend_string *field_name_str;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -838,7 +838,7 @@ PHP_METHOD(SolrDocument, unserialize)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ solr_char_t *serialized = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMPAT_ARG_SIZE_T serialized_length = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zval *objptr = getThis();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ulong document_index = SOLR_UNIQUE_DOCUMENT_INDEX();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ zend_ulong document_index = SOLR_UNIQUE_DOCUMENT_INDEX();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ solr_document_t *doc_entry = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Process the parameters passed to the default constructor */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1184,7 +1184,7 @@ PHP_METHOD(SolrDocument, merge)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zend_hash_merge(destination_document->fields, source_document->fields, p_copy_ctor, (int) overwrite);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Update the field count */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- destination_document->field_count = (uint) zend_hash_num_elements(destination_document->fields);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ destination_document->field_count = (uint32_t) zend_hash_num_elements(destination_document->fields);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RETURN_TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/php7/php_solr_extract.c src/php7/php_solr_extract.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 180e91072bb..e117b438e72 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/php7/php_solr_extract.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/php7/php_solr_extract.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,7 +35,7 @@ extern HashTable *ustreams;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PHP_SOLR_API int solr_init_ustream(zval *obj)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ulong index = SOLR_UNIQUE_USTREAM_INDEX();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ zend_ulong index = SOLR_UNIQUE_USTREAM_INDEX();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ solr_ustream_t *ustream_entry = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ustream_entry = pemalloc(sizeof(solr_ustream_t), 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/php7/php_solr_input_document.c src/php7/php_solr_input_document.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a85bd69bc5c..1722a8396e3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/php7/php_solr_input_document.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/php7/php_solr_input_document.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -708,7 +708,7 @@ PHP_METHOD(SolrInputDocument, merge)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zend_hash_merge(destination_document->fields, source_document->fields, p_copy_ctor, overwrite);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Update the field count */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- destination_document->field_count = (uint) zend_hash_num_elements(destination_document->fields);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ destination_document->field_count = (uint32_t) zend_hash_num_elements(destination_document->fields);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RETURN_TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/php7/php_solr_params.c src/php7/php_solr_params.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3a33e1e0261..3b8234f9a97 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/php7/php_solr_params.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/php7/php_solr_params.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -424,7 +424,7 @@ static int solr_unserialize_solr_params_object(const char *serialized, int size,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ solr_params_t *solr_params = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long int params_index = SOLR_UNIQUE_PARAMS_INDEX();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ solr_params_t tmp_solr_params;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint nSize = SOLR_INITIAL_HASH_TABLE_SIZE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t nSize = SOLR_INITIAL_HASH_TABLE_SIZE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HashTable *params_ht = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xmlDoc *doc = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xmlXPathContext *xpathctxt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/php7/solr_functions_document.c src/php7/solr_functions_document.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e89ef917760..7e001f0aca2 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/php7/solr_functions_document.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/php7/solr_functions_document.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -150,7 +150,7 @@ PHP_SOLR_API int solr_document_insert_field_value_ex(solr_field_list_t *queue, c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PHP_SOLR_API solr_document_t *solr_init_document(long int document_index)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint nSize = SOLR_INITIAL_HASH_TABLE_SIZE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t nSize = SOLR_INITIAL_HASH_TABLE_SIZE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ solr_document_t *doc_ptr = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ solr_document_t *doc_entry;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -194,7 +194,7 @@ PHP_SOLR_API solr_document_t *solr_init_document(long int document_index)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PHP_SOLR_API solr_document_t *solr_input_doc_ctor(zval *objptr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ulong document_index = SOLR_UNIQUE_DOCUMENT_INDEX();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ zend_ulong document_index = SOLR_UNIQUE_DOCUMENT_INDEX();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ solr_document_t *solr_doc = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((solr_doc = solr_init_document(document_index)) == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/php7/solr_functions_helpers.c src/php7/solr_functions_helpers.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index eb32808f491..616032f9cca 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/php7/solr_functions_helpers.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/php7/solr_functions_helpers.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1547,7 +1547,7 @@ PHP_SOLR_API void solr_solrfunc_to_string(solr_function_t *function, solr_string
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ solr_string_t *value;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zend_string *key;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ulong num_idx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ zend_ulong num_idx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ZEND_HASH_FOREACH_KEY_PTR(function->params, num_idx, key, value)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (void)num_idx; /* silent -Wunused-but-set-variable */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1590,7 +1590,7 @@ PHP_SOLR_API void solr_destroy_ustream_zv(zval *obj)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PHP_SOLR_API int solr_fetch_ustream_entry(zval *objptr, solr_ustream_t **stream_entry TSRMLS_DC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zval rv, *index_zv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ulong index = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ zend_ulong index = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ index_zv = zend_read_property(Z_OBJCE_P(objptr), objptr, SOLR_INDEX_PROPERTY_NAME, sizeof(SOLR_INDEX_PROPERTY_NAME)-1, 1, &rv);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ index = Z_LVAL_P(index_zv);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/php7/solr_functions_params.c src/php7/solr_functions_params.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 584577f48a9..3b3e3ed999f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/php7/solr_functions_params.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/php7/solr_functions_params.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,7 +22,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PHP_SOLR_API int solr_init_params(solr_params_t *solr_params, long int index)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint nSize = SOLR_INITIAL_HASH_TABLE_SIZE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t nSize = SOLR_INITIAL_HASH_TABLE_SIZE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ solr_params = (solr_params_t *)pemalloc( sizeof(solr_params_t), SOLR_PARAMS_PERSISTENT);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memset(solr_params, 0, sizeof(solr_params_t));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -605,7 +605,7 @@ PHP_SOLR_API void solr_normal_param_value_fetch(solr_param_t *solr_param, solr_s
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ulong n_loops = solr_param->count - 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ zend_ulong n_loops = solr_param->count - 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while(n_loops)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -646,7 +646,7 @@ PHP_SOLR_API void solr_simple_list_param_value_fetch(solr_param_t *solr_param, s
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ solr_param_value_t *current_ptr = solr_param->head;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ solr_char_t list_delimiter = ','; /* Comma 0x2C */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ulong n_loops = solr_param->count - 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ zend_ulong n_loops = solr_param->count - 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto solr_string_t tmp_buffer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zend_string *url_encoded_list = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -686,7 +686,7 @@ PHP_SOLR_API void solr_arg_list_param_value_fetch(solr_param_t *solr_param, solr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ solr_param_value_t *current_ptr = solr_param->head;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ solr_char_t list_delimiter = solr_param->delimiter;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ solr_char_t separator = solr_param->arg_separator;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ulong n_loops = solr_param->count - 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ zend_ulong n_loops = solr_param->count - 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ solr_string_t tmp_buffer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zend_string *url_encoded_list = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -883,7 +883,7 @@ PHP_SOLR_API void solr_normal_param_value_tostring(solr_param_t *solr_param, sol
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ulong n_loops = solr_param->count - 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ zend_ulong n_loops = solr_param->count - 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zend_string *url_encoded_param_value = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while(n_loops)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -936,7 +936,7 @@ PHP_SOLR_API void solr_simple_list_param_value_tostring(solr_param_t *solr_param
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ solr_param_value_t *current_ptr = solr_param->head;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ solr_char_t list_delimiter = solr_param->delimiter; /* Comma 0x2C */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ulong n_loops = solr_param->count - 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ zend_ulong n_loops = solr_param->count - 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto solr_string_t tmp_buffer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zend_string *url_encoded_list = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -981,7 +981,7 @@ PHP_SOLR_API void solr_arg_list_param_value_tostring(solr_param_t *solr_param, s
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ solr_param_value_t *current_ptr = solr_param->head;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ solr_char_t list_delimiter = solr_param->delimiter;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ solr_char_t separator = solr_param->arg_separator;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ulong n_loops = solr_param->count - 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ zend_ulong n_loops = solr_param->count - 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ solr_string_t tmp_buffer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zend_string *url_encoded_list = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/php7/solr_types.h src/php7/solr_types.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a177a7aacc4..fa6236e4ae9 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/php7/solr_types.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/php7/solr_types.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -163,7 +163,7 @@ typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char str[CURL_ERROR_SIZE + 1]; /* Stores the error message */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint number; /* Stores the error number */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t number; /* Stores the error number */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } solr_curl_error_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -265,9 +265,9 @@ typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ulong client_index; /* Unique for the SolrClient instance. Used as index in HashTables */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ zend_ulong client_index; /* Unique for the SolrClient instance. Used as index in HashTables */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint request_count; /* The number of requests made from this client */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t request_count; /* The number of requests made from this client */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ solr_client_options_t options; /* The connection options for this client */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -305,9 +305,9 @@ typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double field_boost; /* The boost value for this field */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint count; /* The number of values in this field */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t count; /* The number of values in this field */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint modified; /* marks field as getting modified */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t modified; /* marks field as getting modified */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ solr_char_t *field_name; /* The name of the field */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -321,9 +321,9 @@ typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* {{{ Types for Documents and Document Collections */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ulong document_index; /* Unique for the SolrInputDocument instance. Used as index in HashTables */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ zend_ulong document_index; /* Unique for the SolrInputDocument instance. Used as index in HashTables */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint field_count; /* Number of fields in this document */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t field_count; /* Number of fields in this document */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double document_boost; /* The boost value for this document */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -382,7 +382,7 @@ typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ solr_param_type_t type; /* What type of query parameter this is */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint count; /* The number of values for this parameter */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t count; /* The number of values for this parameter */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ solr_char_t *param_name; /* The name of the parameter */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -415,9 +415,9 @@ typedef void (*solr_param_tostring_func_t)(solr_param_t *solr_param, solr_string
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ulong params_index; /* The index for this object in the HashTable */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ zend_ulong params_index; /* The index for this object in the HashTable */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint params_count; /* The number of parameters for the query object */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t params_count; /* The number of parameters for the query object */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HashTable *params; /* The HashTable for storing query parameters */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -428,7 +428,7 @@ typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* {{{ solr function/localparams type */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ulong function_index; /* The index for this object in the HashTable */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ zend_ulong function_index; /* The index for this object in the HashTable */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ solr_char_t *name;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_t name_length;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -469,13 +469,13 @@ typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* {{{ Extension Global : This should be the last data type declared. More members may be added later. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ZEND_BEGIN_MODULE_GLOBALS(solr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint request_count; /* The number of times PHP_RINIT has been called */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t request_count; /* The number of times PHP_RINIT has been called */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint document_count; /* The number of active SolrDocuments in this request */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t document_count; /* The number of active SolrDocuments in this request */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint client_count; /* The number of active SolrClients in this request */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t client_count; /* The number of active SolrClients in this request */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint functions_count; /* The number of active Functions in this request */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t functions_count; /* The number of active Functions in this request */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HashTable *documents; /* HashTable for storing solr_document_t documents */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>