wok-next annotate smx/stuff/patches/smx.patch @ rev 20902

brotli: up (1.0.5); compton: re-version (0.1_beta2+87 -> 20170907); cookutils: up (1087); curl: up (7.61.0); file: up (5.33); gnutls: up (3.5.19); gvfs: up (1.36.2); meson: up (0.47.1); webkit2gtk: update bdeps; add libgdata and uhttpmock
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sat Jul 28 15:39:37 2018 +0300 (2018-07-28)
parents
children
rev   line source
al@20381 1 --- a/modsmx/modsmx.h
al@20381 2 +++ b/modsmx/modsmx.h
al@20381 3 @@ -206,11 +206,11 @@
al@20381 4
al@20381 5 const char *GetServerName() {return ap_get_server_name(myReq);}
al@20381 6 int GetServerPort() {return ap_get_server_port(myReq);}
al@20381 7 - const char *GetServerSoftware() {return ap_get_server_version();}
al@20381 8 + const char *GetServerSoftware() {return ap_get_server_banner();}
al@20381 9 const char *GetServerProtocol() {return myReq->protocol;}
al@20381 10 const char *GetServerAddr();
al@20381 11
al@20381 12 - const char *GetRemoteAddr() {return myReq->connection->remote_ip;}
al@20381 13 + const char *GetRemoteAddr() {return myReq->connection->client_ip;}
al@20381 14 #ifdef APACHE2
al@20381 15 const char *GetRemoteHost() {return (char *) ap_get_remote_host(myReq->connection, myReq->per_dir_config, REMOTE_NAME, NULL);}
al@20381 16 #else
al@20381 17 --- a/modsmx/modsmx.cpp
al@20381 18 +++ b/modsmx/modsmx.cpp
al@20381 19 @@ -55,6 +55,11 @@
al@20381 20 // #define _DWINMEM // define if you want to test memory allocation
al@20381 21
al@20381 22 #include "modsmx.h"
al@20381 23 +#ifdef APLOG_USE_MODULE
al@20381 24 +APLOG_USE_MODULE(smx);
al@20381 25 +#undef APLOG_MARK
al@20381 26 +#define APLOG_MARK __FILE__, __LINE__, APLOG_MODULE_INDEX
al@20381 27 +#endif
al@20381 28
al@20381 29 /* -------------------------------------------------------------- */
al@20381 30 static CMutex gCrit("mod_smx.1917000012");
al@20381 31 --- a/libsmx/dbd_tdb.cpp
al@20381 32 +++ b/libsmx/dbd_tdb.cpp
al@20381 33 @@ -88,7 +88,7 @@
al@20381 34 CStr str;
al@20381 35 TDB_DATA key;
al@20381 36 TDB_DATA data;
al@20381 37 - key.dptr=(char *)name;
al@20381 38 + key.dptr=(unsigned char *)name;
al@20381 39 key.dsize=strlen(name);
al@20381 40
al@20381 41 int retry = 0;
al@20381 42 @@ -114,7 +114,7 @@
al@20381 43
al@20381 44 bool CDBDriverTdb::Exists(const char *name) {
al@20381 45 TDB_DATA key;
al@20381 46 - key.dptr=(char *)name;
al@20381 47 + key.dptr=(unsigned char *)name;
al@20381 48 key.dsize=strlen(name);
al@20381 49 return tdb_exists(m_db, key);
al@20381 50 }
al@20381 51 @@ -122,7 +122,7 @@
al@20381 52 bool CDBDriverTdb::Del(const char *name, HTRANS txn) {
al@20381 53 CStr str;
al@20381 54 TDB_DATA key;
al@20381 55 - key.dptr=(char *)name;
al@20381 56 + key.dptr=(unsigned char *)name;
al@20381 57 key.dsize=strlen(name);
al@20381 58 return tdb_delete(m_db, key) == 0;
al@20381 59 }
al@20381 60 @@ -133,9 +133,9 @@
al@20381 61 CStr str;
al@20381 62 TDB_DATA key;
al@20381 63 TDB_DATA data;
al@20381 64 - key.dptr=(char *)name;
al@20381 65 + key.dptr=(unsigned char *)name;
al@20381 66 key.dsize=strlen(name);
al@20381 67 - data.dptr=(char *)val;
al@20381 68 + data.dptr=(unsigned char *)val;
al@20381 69 data.dsize=vlen;
al@20381 70 if (tdb_store(m_db, key, data, TDB_REPLACE) == 0) {
al@20381 71 return true;