When "apache reload" is called, the PHP-CPP library made the entire Apache process crash. This has been fixed

1 files changed, 16 insertions, 0 deletions

diff --git a/include/extension.h b/include/extension.h
index f03c8fb..562fceb 100644
--- a/include/extension.h
+++ b/include/extension.h
@@ -111,6 +111,9 @@ public:
      */
     Extension &add(Ini &&ini)
     {
+        // skip when locked
+        if (locked()) return *this;
+        
         // and add it to the list of classes
         _ini_entries.emplace_back(new Ini(std::move(ini)));
         
@@ -125,6 +128,9 @@ public:
      */
     Extension &add(const Ini &ini)
     {
+        // skip when locked
+        if (locked()) return *this;
+
         // and add it to the list of classes
         _ini_entries.emplace_back(new Ini(ini));
         
@@ -180,6 +186,16 @@ public:
     {
         return module();
     }
+    
+protected:
+    /**
+     *  Is the extension object in a locked state? This happens after the
+     *  get_module() function was called for the first time ("apache reload"
+     *  forces a new call to get_module())
+     * 
+     *  @return bool
+     */
+    virtual bool locked() const override;
 
 private:
     /**