Merge branch 'PHP-5.6'

Browse Source

* PHP-5.6:
  Fix bug #64938: libxml_disable_entity_loader setting is shared between threads

Conflicts:
	ext/libxml/libxml.c

...

This commit is contained in:

Stanislav Malyshev 2015-02-01 00:09:44 -08:00

parent d893814b58 463611714c

commit c0237617e1

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available