Check in 1.8.1

litespeedtech · Mar 28, 2024 · ed120f9 · ed120f9
1 parent 620855d
commit ed120f9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/src/http/stderrlogger.cpp b/src/http/stderrlogger.cpp
@@ -120,12 +120,8 @@ int StdErrLogger::setLogFileName(const char *pName)
 }
 
 
-const char *StdErrLogger::getLogFileName()
-{   
-    if (!m_pAppender)
-        m_pAppender = HttpLog::getErrorLogger()->getAppender();
-    return m_pAppender->getName();     
-}
+const char *StdErrLogger::getLogFileName() const
+{   return m_pAppender ? m_pAppender->getName() : NULL;     }
 
 
 int StdErrLogger::initLogger(Multiplexer *pMultiplexer)

diff --git a/src/http/stderrlogger.h b/src/http/stderrlogger.h
@@ -39,7 +39,7 @@ class StdErrLogger : public EventReactor, public TSingleton<StdErrLogger>
 public:
     ~StdErrLogger();
     int setLogFileName(const char *pName);
-    const char *getLogFileName();
+    const char *getLogFileName() const;
     virtual int handleEvents(short event);
     int getStdErr() const   {   return m_fdStdErr;    }
     int initLogger(Multiplexer *pMultiplexer);

diff --git a/src/main/lshttpdmain.cpp b/src/main/lshttpdmain.cpp
@@ -90,7 +90,7 @@
 /***
  * Do not change the below format, it will be set correctly while packing the code
  */
-#define BUILDTIME  "built: Thu Mar 28 03:28:50 UTC 2024"
+#define BUILDTIME  "built: Thu Mar 28 15:46:53 UTC 2024"
 
 static const char s_pVersionFull[] = "LiteSpeed/" PACKAGE_VERSION
         " Open (" LS_MODULE_VERSION_INFO_ONELINE ") BUILD (" BUILDTIME ")";

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -162,7 +162,7 @@ set ( libUnitTest UnitTest++ )
 SET( unittestlib
     modgzip cache lsiapi main http lsiapi ssi
     registry cgi fcgi jk extensions lsapi proxy
-    socket sslpp lsshm thread log4cxx GeoIP adns
+    socket sslpp lsshm thread log4cxx adns
     quic h2 lsquic bcrypt
     -Wl,--whole-archive util lsr -Wl,--no-whole-archive
     edio udns pthread rt ${CMAKE_DL_LIBS} ${libUnitTest} ${BSSL_ADD_LIB}