Add Apache::globale_remove to remove global_variable when sharing mrb…

…_state
matsumotory · Oct 9, 2013 · 39d6e1f · 39d6e1f
1 parent f9c779d
commit 39d6e1f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/example/gv_remove/remove.rb b/example/gv_remove/remove.rb
@@ -0,0 +1,5 @@
+# mrubyFixupsMiddle "/usr/local/apache/hooks/test.rb"
+$hoge = 1
+Apache::rputs global_variables.to_s
+Apache::rputs "hoge"
+Apache::rputs Apache::global_remove(:$hoge).to_s
diff --git a/mruby b/mruby
diff --git a/src/ap_mrb_core.c b/src/ap_mrb_core.c
@@ -256,6 +256,15 @@ mrb_value ap_mrb_server_name(mrb_state *mrb, mrb_value self)
     return mrb_str_new_cstr(mrb, AP_SERVER_BASEPRODUCT);
 }
 
+mrb_value ap_mrb_f_global_remove(mrb_state *mrb, mrb_value self)
+{
+    mrb_sym id;
+    mrb_get_args(mrb, "n", &id);
+    mrb_gv_remove(mrb, id);
+
+    return mrb_f_global_variables(mrb, self);
+}
+
 void ap_mruby_core_init(mrb_state *mrb, struct RClass *class_core)
 {
 
@@ -335,4 +344,5 @@ void ap_mruby_core_init(mrb_state *mrb, struct RClass *class_core)
     mrb_define_class_method(mrb, class_core, "mod_mruby_version", ap_mrb_get_mod_mruby_version, ARGS_NONE());
     mrb_define_class_method(mrb, class_core, "server_version", ap_mrb_get_server_version, ARGS_NONE());
     mrb_define_class_method(mrb, class_core, "server_build", ap_mrb_get_server_build, ARGS_NONE());
+    mrb_define_class_method(mrb, class_core, "global_remove", ap_mrb_f_global_remove, ARGS_REQ(1));
 }
diff --git a/src/ap_mrb_core.h b/src/ap_mrb_core.h
@@ -12,6 +12,7 @@
 
 #include "http_protocol.h"
 #include "mruby/string.h"
+#include "mruby/variable.h"
 
 
 #define INVALID_PRIORITY    -1