Merge branch 'master' of github.com:chronolaw/ngx_cpp_dev

Author: Chrono Law

modules/subrequest/NdgSubrequestConf.hpp

@@ -28,8 +28,8 @@ class NdgSubrequestConf final
         auto prev = reinterpret_cast<this_type*>(parent);
         auto conf = reinterpret_cast<this_type*>(child);
 
-        NgxValue::merge(conf->loc, prev->loc, ngx_string("/echo"));
-        NgxValue::merge(conf->args, prev->args, ngx_null_string);
+        NgxValue::merge(conf->loc, prev->loc, ngx_str_t ngx_string("/echo"));
+        NgxValue::merge(conf->args, prev->args, ngx_str_t ngx_null_string);
 
         return NGX_CONF_OK;
     }

ngxpp/NgxEvent.hpp

@@ -20,11 +20,17 @@ class NgxEvent final : public NgxWrapper<ngx_event_t>
     ~NgxEvent() = default;
 public:
     template<typename T>
-    void data(T *p) const
+    void data(T* p) const
     {
         get()->data = p;
     }
 
+    template<typename T>
+    void data(T& v) const
+    {
+        get()->data = &v;
+    }
+
     template<typename T>
     T& data() const
     {

ngxpp/NgxHeaders.hpp

@@ -59,6 +59,11 @@ class NgxHeaders final : public NgxWrapper<T>
 
         return p->value;
     }
+
+    ngx_str_t operator[](const char* key) const
+    {
+        return operator[](string_ref_type(key));
+    }
 public:
     void add(const kv_type& kv) const
     {

ngxpp/NgxModule.hpp

@@ -86,6 +86,17 @@ class NgxModuleConfig final
         return get<T3>(ctx(cf)->loc_conf);
     }
 
+public:
+    // cycle->conf_ccycle->conf_ctxtx[ngx_http_module.index] must not null
+    META_TYPE(T1) main(ngx_cycle_t* cycle) const
+    {
+        return get<T1>(ctx(cycle)->main_conf);
+    }
+
+    ngx_http_conf_ctx_t* ctx(ngx_cycle_t* cycle) const
+    {
+        return reinterpret_cast<ngx_http_conf_ctx_t*>(cycle->conf_ctx[ngx_http_module.index]);
+    }
 private:
     ngx_http_conf_ctx_t* ctx(ngx_conf_t* cf) const
     {

ngxpp/NgxRequest.hpp

@@ -78,6 +78,20 @@ class NgxRequest final : public NgxWrapper<ngx_http_request_t>
     {
         return m_body;
     }
+public:
+    ngx_str_t arg(const ngx_str_t& name) const
+    {
+        ngx_str_t value = ngx_null_string;
+
+        ngx_http_arg(get(), name.data, name.len, &value);
+
+        return value;
+    }
+public:
+    void finalize(ngx_int_t rc = NGX_HTTP_INTERNAL_SERVER_ERROR) const
+    {
+        ngx_http_finalize_request(get(), rc);
+    }
 private:
     headers_type        m_headers;
     body_type           m_body;
@@ -113,6 +127,34 @@ class NgxResponse final : public NgxWrapper<ngx_http_request_t>
         headers()->content_length_n = len;
     }
 
+public:
+    ngx_uint_t status() const
+    {
+        return headers()->status;
+    }
+
+    off_t length() const
+    {
+        return headers()->content_length_n;
+    }
+public:
+    void set_content_type() const
+    {
+        auto rc = ngx_http_set_content_type(get());
+
+        NgxException::require(rc);
+    }
+
+    void clear_content_length() const
+    {
+        ngx_http_clear_content_length(get());
+    }
+
+    void clear_accept_ranges() const
+    {
+        ngx_http_clear_accept_ranges(get());
+    }
+
 public:
     ngx_int_t send() const
     {
@@ -199,5 +241,34 @@ class NgxResponse final : public NgxWrapper<ngx_http_request_t>
     NgxPool             m_pool;
 };
 
+class NgxRequestCleanup final : public NgxWrapper<ngx_http_request_t>
+{
+public:
+    typedef NgxWrapper<ngx_http_request_t> super_type;
+    typedef NgxRequestCleanup this_type;
+public:
+    NgxRequestCleanup(ngx_http_request_t* r):super_type(r)
+    {}
+
+    ~NgxRequestCleanup() = default;
+public:
+    template<typename F>
+    ngx_http_cleanup_t* add(F f, std::size_t n = 0) const
+    {
+        auto cln = ngx_http_cleanup_add(get(), n);
+
+        NgxException::require(cln);
+
+        cln->handler = f;
+
+        if(!n)
+        {
+            cln->data = get();
+        }
+
+        return cln;
+    }
+};
+
 #endif  //_NGX_HTTP_REQUEST_HPP