]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7272e3e a0b4348)
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Sun, 23 Jun 2013 22:21:45 +0000 (15:21 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 23 Jun 2013 22:26:14 +0000 (15:26 -0700)
commit1beb24bd6f5376a93c062218a73a5f1d5f04278a
tree0ecea95641449b675d0d1a617c9de4049c7a5f84tree | snapshot
parent7272e3e72232b4aa0374209b7779df440c9bdc33commit | diff
parenta0b4348abc09e00170a334c6f67ef399e8b36a1ecommit | diff
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Implements feature Bug #63472 ability to set SO_BINDTODEVICE on socket.

Conflicts:
ext/sockets/sockets.c
NEWS diff1 | diff2 | blob | history
ext/sockets/sockets.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.