php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-30 20:22:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into xml-protocol

Browse Source
This commit is contained in:
Bob Weinand
2014-10-09 12:01:43 +02:00
parent b426897c9c ca7f2f5f43
commit eeafa4e518
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpdbg.c
View File

@@ -834,18 +834,18 @@ static void phpdbg_remote_close(int socket, FILE *stream) {
}
/* don't inline this, want to debug it easily, will inline when done */
static int phpdbg_remote_init(const char* address, short port, int *server, int *socket, FILE **stream) {
static int phpdbg_remote_init(const char* address, unsigned short port, int *server, int *socket, FILE **stream) {
phpdbg_remote_close(*socket, *stream);
*server = phpdbg_open_socket(address, port);
if (*server < 0) {
phpdbg_rlog(fileno(stderr), "Initializing connection on %s:%d failed", address, port);
phpdbg_rlog(fileno(stderr), "Initializing connection on %s:%u failed", address, port);
return FAILURE;
}
phpdbg_rlog(fileno(stderr), "accepting connections on %s:%d", address, port);
phpdbg_rlog(fileno(stderr), "accepting connections on %s:%u", address, port);
{
struct sockaddr_in address;
socklen_t size = sizeof(address);