]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorDmitry Stogov <dmitry@zend.com>
Thu, 7 Feb 2013 12:09:12 +0000 (16:09 +0400)
committerDmitry Stogov <dmitry@zend.com>
Thu, 7 Feb 2013 12:09:12 +0000 (16:09 +0400)
* PHP-5.3:
  Disabled external entities loading

1  2 
ext/soap/php_xml.c

Simple merge