wok-next view smx/stuff/patches/smx.patch @ rev 21575
updated linux (4.14.85 -> 4.17.7)
| author | Hans-G?nter Theisgen |
|---|---|
| date | Tue Jun 23 07:23:21 2020 +0100 (2020-06-23) |
| parents | |
| children |
line source
1 --- a/modsmx/modsmx.h
2 +++ b/modsmx/modsmx.h
3 @@ -206,11 +206,11 @@
5 const char *GetServerName() {return ap_get_server_name(myReq);}
6 int GetServerPort() {return ap_get_server_port(myReq);}
7 - const char *GetServerSoftware() {return ap_get_server_version();}
8 + const char *GetServerSoftware() {return ap_get_server_banner();}
9 const char *GetServerProtocol() {return myReq->protocol;}
10 const char *GetServerAddr();
12 - const char *GetRemoteAddr() {return myReq->connection->remote_ip;}
13 + const char *GetRemoteAddr() {return myReq->connection->client_ip;}
14 #ifdef APACHE2
15 const char *GetRemoteHost() {return (char *) ap_get_remote_host(myReq->connection, myReq->per_dir_config, REMOTE_NAME, NULL);}
16 #else
17 --- a/modsmx/modsmx.cpp
18 +++ b/modsmx/modsmx.cpp
19 @@ -55,6 +55,11 @@
20 // #define _DWINMEM // define if you want to test memory allocation
22 #include "modsmx.h"
23 +#ifdef APLOG_USE_MODULE
24 +APLOG_USE_MODULE(smx);
25 +#undef APLOG_MARK
26 +#define APLOG_MARK __FILE__, __LINE__, APLOG_MODULE_INDEX
27 +#endif
29 /* -------------------------------------------------------------- */
30 static CMutex gCrit("mod_smx.1917000012");
31 --- a/libsmx/dbd_tdb.cpp
32 +++ b/libsmx/dbd_tdb.cpp
33 @@ -88,7 +88,7 @@
34 CStr str;
35 TDB_DATA key;
36 TDB_DATA data;
37 - key.dptr=(char *)name;
38 + key.dptr=(unsigned char *)name;
39 key.dsize=strlen(name);
41 int retry = 0;
42 @@ -114,7 +114,7 @@
44 bool CDBDriverTdb::Exists(const char *name) {
45 TDB_DATA key;
46 - key.dptr=(char *)name;
47 + key.dptr=(unsigned char *)name;
48 key.dsize=strlen(name);
49 return tdb_exists(m_db, key);
50 }
51 @@ -122,7 +122,7 @@
52 bool CDBDriverTdb::Del(const char *name, HTRANS txn) {
53 CStr str;
54 TDB_DATA key;
55 - key.dptr=(char *)name;
56 + key.dptr=(unsigned char *)name;
57 key.dsize=strlen(name);
58 return tdb_delete(m_db, key) == 0;
59 }
60 @@ -133,9 +133,9 @@
61 CStr str;
62 TDB_DATA key;
63 TDB_DATA data;
64 - key.dptr=(char *)name;
65 + key.dptr=(unsigned char *)name;
66 key.dsize=strlen(name);
67 - data.dptr=(char *)val;
68 + data.dptr=(unsigned char *)val;
69 data.dsize=vlen;
70 if (tdb_store(m_db, key, data, TDB_REPLACE) == 0) {
71 return true;