Skip to content

Instantly share code, notes, and snippets.

@drouarb
Created November 17, 2015 11:04
Show Gist options
  • Select an option

  • Save drouarb/6fdcbbb5589aa0286dc6 to your computer and use it in GitHub Desktop.

Select an option

Save drouarb/6fdcbbb5589aa0286dc6 to your computer and use it in GitHub Desktop.
--- php-5.2.17/ext/dom/node.c 2010-05-01 14:30:38.000000000 -0400
+++ php-5.2.17-patch/ext/dom/node.c 2015-11-17 05:43:49.980000000 -0500
@@ -1950,9 +1950,17 @@
RETVAL_FALSE;
} else {
if (mode == 0) {
+#ifdef LIBXML2_NEW_BUFFER
+ ret = xmlOutputBufferGetSize(buf);
+#else
ret = buf->buffer->use;
+#endif
if (ret > 0) {
+#ifdef LIBXML2_NEW_BUFFER
+ RETVAL_STRINGL((char *) xmlOutputBufferGetContent(buf), ret, 1);
+#else
RETVAL_STRINGL((char *) buf->buffer->content, ret, 1);
+#endif
} else {
RETVAL_EMPTY_STRING();
}
--- php-5.2.17/ext/dom/documenttype.c 2010-01-03 04:23:27.000000000 -0500
+++ php-5.2.17-patch/ext/dom/documenttype.c 2015-11-17 05:45:46.572000000 -0500
@@ -215,7 +215,12 @@
if (buff != NULL) {
xmlNodeDumpOutput (buff, NULL, (xmlNodePtr) intsubset, 0, 0, NULL);
xmlOutputBufferFlush(buff);
+#ifdef LIBXML2_NEW_BUFFER
+ ZVAL_STRINGL(*retval, xmlOutputBufferGetContent(buff),
+ xmlOutputBufferGetSize(buff), 1);
+#else
ZVAL_STRINGL(*retval, buff->buffer->content, buff->buffer->use, 1);
+#endif
(void)xmlOutputBufferClose(buff);
return SUCCESS;
}
--- php-5.2.17/ext/simplexml/simplexml.c 2010-05-05 07:40:11.000000000 -0400
+++ php-5.2.17-patch/ext/simplexml/simplexml.c 2015-11-17 05:47:27.204000000 -0500
@@ -1343,7 +1343,12 @@
xmlNodeDumpOutput(outbuf, (xmlDocPtr) sxe->document->ptr, node, 0, 0, ((xmlDocPtr) sxe->document->ptr)->encoding);
xmlOutputBufferFlush(outbuf);
+#ifdef LIBXML2_NEW_BUFFER
+ RETVAL_STRINGL((char *)xmlOutputBufferGetContent(outbuf),
+ xmlOutputBufferGetSize(outbuf), 1);
+#else
RETVAL_STRINGL((char *)outbuf->buffer->content, outbuf->buffer->use, 1);
+#endif
xmlOutputBufferClose(outbuf);
}
} else {
--- php-5.2.17/ext/gmp/gmp.c 2015-11-17 05:52:38.044000000 -0500
+++ php-5.2.17-patch/ext/gmp/gmp.c 2015-11-17 05:41:21.208000000 -0500
@@ -1396,7 +1396,7 @@
GMPG(rand_initialized) = 1;
}
- mpz_urandomb(*gmpnum_result, GMPG(rand_state), GMP_ABS (limiter) * __GMP_BITS_PER_MP_LIMB);
+ mpz_urandomb(*gmpnum_result, GMPG(rand_state), GMP_ABS (limiter) * GMP_LIMB_BITS);
ZEND_REGISTER_RESOURCE(return_value, gmpnum_result, le_gmp);
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment