#11 2.11.26 - FreeBSD patches

[Edwin Groothuis]

Please review the following patches:

The first includes are to make sure that inet_isaddr
and gethostbyname are prototyped properly.
The wcnt is an unused variable (-Wall)
The last one is a long vs int issue.

--- dbg_cmd.c.orig Sat Sep 11 18:46:24 2004
+++ dbg_cmd.c Sat Sep 11 18:48:11 2004
@@ -20,6 +20,12 @@
#include "dbg_bp.h"
#include "SAPI.h"

+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+
#include "php_network.h"

@@ -789,7 +795,7 @@

/* waiting and looking for debugger host responce */
inline void dbg_ack_loop(TSRMLS_D2(DBG, E)) {
- int ret_val = 0, wcnt = 0;
+ int ret_val = 0;
dbg_header_struct hdr;
dbg_packet pack;

@@ -1102,7 +1108,7 @@
DBG(req_client_port) =
atol(numbuf);
if (DBG(req_client_port) <= 0
|| DBG(req_client_port) > 32767) DBG(req_client_port) =
DEFAULT_PORT;
}
- snprintf(reqbuf, sizeof(reqbuf),
DBGSESSVAR "=%s@%s:%d", DBG(session_id),
DBG(req_client_ip_address), DBG(req_client_port));
+ snprintf(reqbuf, sizeof(reqbuf),
DBGSESSVAR "=%s@%s:%ld", DBG(session_id),
DBG(req_client_ip_address), DBG(req_client_port));
DBG(req_sess_var) = estrdup(reqbuf);
DBG_TRACE(("parsed req IP=%s, PORT=%ld
(%s), SID=%s\n", SON(DBG(req_client_ip_address)),
DBG(req_client_port), numbuf, SON(DBG(session_id))));
} else {

[Dmitri Dmitrienko]

Logged In: YES
user_id=161940

Please check (if possible) with the latest dbg (2.15)