Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  correct the bug #67081 fix
This commit is contained in:
Anatol Belski 2014-04-16 15:08:08 +02:00
commit 947b20bc67

View File

@ -211,7 +211,7 @@ int dom_documenttype_internal_subset_read(dom_object *obj, zval **retval TSRMLS_
xmlOutputBufferFlush(buff);
#ifdef LIBXML2_NEW_BUFFER
smart_str_appendl(ret_buf, xmlOutputBufferGetContent(buff), xmlOutputBufferGetSize(buff));
smart_str_appendl(&ret_buf, xmlOutputBufferGetContent(buff), xmlOutputBufferGetSize(buff));
#else
smart_str_appendl(&ret_buf, buff->buffer->content, buff->buffer->use);
#endif