Merge branch 'PHP-5.3' into PHP-5.4

Browse Source

* PHP-5.3:
  Fix bug #61659 Test ext\spl\tests\bug60082.phpt fails
  Fixed bug #61638 Test ext\sockets\tests\unixloop.phpt fails
  Fixed bug #61637 ext\sockets\tests\socket_sentto_recvfrom_unix.phpt
  Fixed bug #61635 ext\sockets\tests\socket_select-wrongparams-1.phpt

Conflicts:
	ext/spl/tests/bug60082.phpt

...

This commit is contained in:

Anatoliy Belsky 2012-04-10 14:05:07 +02:00

parent 024cd2a124 b2f2e1d6cc

commit 13211f201a

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