SliTaz Repositories

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/smx/stuff/patches/smx.patch	Tue Jun 23 07:23:21 2020 +0100
     1.3 @@ -0,0 +1,71 @@
     1.4 +--- a/modsmx/modsmx.h
     1.5 ++++ b/modsmx/modsmx.h
     1.6 +@@ -206,11 +206,11 @@
     1.7 + 
     1.8 + 	const char *GetServerName()		{return ap_get_server_name(myReq);}
     1.9 + 	int   GetServerPort()			{return ap_get_server_port(myReq);}
    1.10 +-	const char *GetServerSoftware()	{return ap_get_server_version();}
    1.11 ++	const char *GetServerSoftware()	{return ap_get_server_banner();}
    1.12 + 	const char *GetServerProtocol()	{return myReq->protocol;}
    1.13 + 	const char *GetServerAddr();
    1.14 + 
    1.15 +-	const char *GetRemoteAddr()		{return myReq->connection->remote_ip;}
    1.16 ++	const char *GetRemoteAddr()		{return myReq->connection->client_ip;}
    1.17 + #ifdef APACHE2
    1.18 + 	const char *GetRemoteHost()		{return (char *) ap_get_remote_host(myReq->connection, myReq->per_dir_config, REMOTE_NAME, NULL);}
    1.19 + #else
    1.20 +--- a/modsmx/modsmx.cpp
    1.21 ++++ b/modsmx/modsmx.cpp
    1.22 +@@ -55,6 +55,11 @@
    1.23 + // #define _DWINMEM // define if you want to test memory allocation
    1.24 + 
    1.25 + #include "modsmx.h"
    1.26 ++#ifdef APLOG_USE_MODULE
    1.27 ++APLOG_USE_MODULE(smx);
    1.28 ++#undef APLOG_MARK
    1.29 ++#define APLOG_MARK __FILE__, __LINE__, APLOG_MODULE_INDEX
    1.30 ++#endif
    1.31 + 
    1.32 + /* -------------------------------------------------------------- */
    1.33 + static CMutex gCrit("mod_smx.1917000012");
    1.34 +--- a/libsmx/dbd_tdb.cpp
    1.35 ++++ b/libsmx/dbd_tdb.cpp
    1.36 +@@ -88,7 +88,7 @@
    1.37 + 	CStr str;
    1.38 + 	TDB_DATA key;
    1.39 + 	TDB_DATA data;
    1.40 +-	key.dptr=(char *)name;
    1.41 ++	key.dptr=(unsigned char *)name;
    1.42 + 	key.dsize=strlen(name);
    1.43 + 
    1.44 + 	int retry = 0;
    1.45 +@@ -114,7 +114,7 @@
    1.46 + 
    1.47 + bool CDBDriverTdb::Exists(const char *name) {
    1.48 +         TDB_DATA key;
    1.49 +-        key.dptr=(char *)name;
    1.50 ++        key.dptr=(unsigned char *)name;
    1.51 +         key.dsize=strlen(name);
    1.52 +         return tdb_exists(m_db, key);
    1.53 + }
    1.54 +@@ -122,7 +122,7 @@
    1.55 + bool CDBDriverTdb::Del(const char *name, HTRANS txn) {
    1.56 +         CStr str;
    1.57 +         TDB_DATA key;
    1.58 +-        key.dptr=(char *)name;
    1.59 ++        key.dptr=(unsigned char *)name;
    1.60 +         key.dsize=strlen(name);
    1.61 +         return tdb_delete(m_db, key) == 0;
    1.62 + }
    1.63 +@@ -133,9 +133,9 @@
    1.64 +         CStr str;
    1.65 +         TDB_DATA key;
    1.66 +         TDB_DATA data;
    1.67 +-        key.dptr=(char *)name;
    1.68 ++        key.dptr=(unsigned char *)name;
    1.69 +         key.dsize=strlen(name);
    1.70 +-        data.dptr=(char *)val;
    1.71 ++        data.dptr=(unsigned char *)val;
    1.72 +         data.dsize=vlen;
    1.73 +         if (tdb_store(m_db, key, data, TDB_REPLACE) == 0) {
    1.74 + 		return true;