inets: Use re instead of inets_regexp

14 files changed, 150 insertions, 164 deletions

diff --git a/lib/inets/src/http_server/httpd.erl b/lib/inets/src/http_server/httpd.erl
index cf02c0e072..e6377b4882 100644
--- a/lib/inets/src/http_server/httpd.erl
+++ b/lib/inets/src/http_server/httpd.erl
@@ -43,7 +43,7 @@
 %%%========================================================================
 
 parse_query(String) ->
-  {ok, SplitString} = inets_regexp:split(String,"[&;]"),
+  SplitString = re:split(String,"[&;]", [{return, list}]),
   foreach(SplitString).
 
 reload_config(Config = [Value| _], Mode) when is_tuple(Value) ->
@@ -239,14 +239,14 @@ unblock(Addr, Port, Profile) when is_integer(Port) ->
 foreach([]) ->
   [];
 foreach([KeyValue|Rest]) ->
-  {ok, Plus2Space, _} = inets_regexp:gsub(KeyValue,"[\+]"," "),
-  case inets_regexp:split(Plus2Space,"=") of
-    {ok,[Key|Value]} ->
-      [{http_uri:decode(Key),
-	http_uri:decode(lists:flatten(Value))}|foreach(Rest)];
-    {ok,_} ->
-      foreach(Rest)
-  end.
+    Plus2Space = re:replace(KeyValue,"[\+]"," ", [{return,list}, global]),
+    case re:split(Plus2Space,"=", [{return, list}]) of
+	[Key|Value] ->
+	    [{http_uri:decode(Key),
+	      http_uri:decode(lists:flatten(Value))}|foreach(Rest)];
+	_ ->
+	    foreach(Rest)
+    end.
 
 
 make_name(Addr, Port, Profile) ->
diff --git a/lib/inets/src/http_server/httpd_conf.erl b/lib/inets/src/http_server/httpd_conf.erl
index 7d31989244..d592984669 100644
--- a/lib/inets/src/http_server/httpd_conf.erl
+++ b/lib/inets/src/http_server/httpd_conf.erl
@@ -232,7 +232,7 @@ load("KeepAliveTimeout " ++ Timeout, []) ->
     end;
 
 load("Modules " ++ Modules, []) ->
-    {ok, ModuleList} = inets_regexp:split(Modules," "),
+    ModuleList = re:split(Modules," ", [{return, list}]),
     {ok, [], {modules,[list_to_atom(X) || X <- ModuleList]}};
 
 load("ServerAdmin " ++ ServerAdmin, []) ->
@@ -876,7 +876,7 @@ bootstrap([]) ->
 bootstrap([Line|Config]) ->
     case Line of
 	"Modules " ++ Modules ->
-	    {ok, ModuleList} = inets_regexp:split(Modules," "),
+	    ModuleList = re:split(Modules," ", [{return, list}]),
 	    TheMods = [list_to_atom(X) || X <- ModuleList],
 	    case verify_modules(TheMods) of
 		ok ->
@@ -1001,7 +1001,7 @@ read_config_file(Stream, SoFar) ->
 	    %% Ignore commented lines for efficiency later ..
 	    read_config_file(Stream, SoFar);
 	Line ->
-	    {ok, NewLine, _}=inets_regexp:sub(clean(Line),"[\t\r\f ]"," "),
+	    NewLine = re:replace(clean(Line),"[\t\r\f ]"," ", [{return,list}]),
 	    case NewLine of
 		[] ->
 		    %% Also ignore empty lines ..
@@ -1028,12 +1028,12 @@ parse_mime_types(Stream, MimeTypesList, "") ->
 parse_mime_types(Stream, MimeTypesList, [$#|_]) ->
     parse_mime_types(Stream, MimeTypesList);
 parse_mime_types(Stream, MimeTypesList, Line) ->
-    case inets_regexp:split(Line, " ") of
-	{ok, [NewMimeType|Suffixes]} ->
+    case re:split(Line, " ", [{return, list}]) of
+	[NewMimeType|Suffixes] ->
 	    parse_mime_types(Stream,
 			     lists:append(suffixes(NewMimeType,Suffixes),
 					  MimeTypesList));
-	{ok, _} ->
+	_ ->
 	    {error, ?NICE(Line)}
     end.
 
@@ -1204,9 +1204,8 @@ error_report(Where,M,F,Error) ->
     error_logger:error_report([{?MODULE, Where}, 
 			       {apply, {M, F, []}}, Error]).
 white_space_clean(String) ->
-    {ok,CleanedString,_} = 
-	inets_regexp:gsub(String, "^[ \t\n\r\f]*|[ \t\n\r\f]*\$",""),
-    CleanedString.
+    re:replace(String, "^[ \t\n\r\f]*|[ \t\n\r\f]*\$","", 
+	       [{return,list}, global]).
 
 
 %%%=========================================================================
@@ -1243,22 +1242,23 @@ is_file(_Type,_Access,FileInfo,_File) ->
     {error,FileInfo}.
 
 make_integer(String) ->
-    case inets_regexp:match(string:strip(String),"[0-9]+") of
-	{match, _, _} ->
+    case re:run(string:strip(String),"[0-9]+", [{capture, none}]) of
+	match ->
 	    {ok, list_to_integer(string:strip(String))};
 	nomatch ->
 	    {error, nomatch}
     end.
 
 clean(String) ->
-    {ok,CleanedString,_} = 
-	inets_regexp:gsub(String, "^[ \t\n\r\f]*|[ \t\n\r\f]*\$",""),
-    CleanedString.
+    re:replace(String, "^[ \t\n\r\f]*|[ \t\n\r\f]*\$","",
+	       [{return,list}, global]).
 
 custom_clean(String,MoreBefore,MoreAfter) ->
-    {ok,CleanedString,_} = inets_regexp:gsub(String,"^[ \t\n\r\f"++MoreBefore++
-				       "]*|[ \t\n\r\f"++MoreAfter++"]*\$",""),
-    CleanedString.
+    re:replace(String,
+	       "^[ \t\n\r\f"++MoreBefore++
+		   "]*|[ \t\n\r\f"++MoreAfter++"]*\$","",
+	       [{return,list}, global]).
+
 
 check_enum(_Enum,[]) ->
     {error, not_valid};
diff --git a/lib/inets/src/http_server/httpd_script_env.erl b/lib/inets/src/http_server/httpd_script_env.erl
index 21b22f4420..232bf96bd4 100644
--- a/lib/inets/src/http_server/httpd_script_env.erl
+++ b/lib/inets/src/http_server/httpd_script_env.erl
@@ -104,7 +104,7 @@ create_http_header_elements(ScriptType, [{Name, [Value | _] = Values } |
 
 create_http_header_elements(ScriptType, [{Name, Value} | Headers], Acc) 
   when is_list(Value) ->
-    {ok, NewName, _} = inets_regexp:gsub(Name,"-","_"),
+    NewName = re:replace(Name,"-","_", [{return,list}, global]),
     Element = http_env_element(ScriptType, NewName, Value),
     create_http_header_elements(ScriptType, Headers, [Element | Acc]).
 
diff --git a/lib/inets/src/http_server/httpd_util.erl b/lib/inets/src/http_server/httpd_util.erl
index fc69baf829..9133309689 100644
--- a/lib/inets/src/http_server/httpd_util.erl
+++ b/lib/inets/src/http_server/httpd_util.erl
@@ -430,11 +430,11 @@ flatlength([],L) ->
 %% split_path
 
 split_path(Path) ->
-    case inets_regexp:match(Path,"[\?].*\$") of
+    case re:run(Path,"[\?].*\$", [{capture, first}]) of
 	%% A QUERY_STRING exists!
-	{match,Start,Length} ->
-	    {http_uri:decode(string:substr(Path,1,Start-1)),
-	     string:substr(Path,Start,Length)};
+	{match,[{Start,Length}]} ->
+	    {http_uri:decode(string:substr(Path,1,Start)),
+	     string:substr(Path,Start+1,Length)};
 	%% A possible PATH_INFO exists!
 	nomatch ->
 	    split_path(Path,[])
@@ -532,25 +532,8 @@ remove_ws(Rest) ->
 
 %% split
 
-split(String,RegExp,Limit) ->
-    case inets_regexp:parse(RegExp) of
-	{error,Reason} ->
-	    {error,Reason};
-	{ok,_} ->
-	    {ok,do_split(String,RegExp,Limit)}
-    end.
-
-do_split(String, _RegExp, 1) ->
-    [String];
-
-do_split(String,RegExp,Limit) ->
-    case inets_regexp:first_match(String,RegExp) of 
-	{match,Start,Length} ->
-	    [string:substr(String,1,Start-1)|
-	     do_split(lists:nthtail(Start+Length-1,String),RegExp,Limit-1)];
-	nomatch ->
-	    [String]
-    end.
+split(String,RegExp,N) ->
+    {ok, re:split(String, RegExp, [{parts, N}, {return, list}])}.
 
 %% make_name/2, make_name/3
 %% Prefix  -> string()
diff --git a/lib/inets/src/http_server/mod_actions.erl b/lib/inets/src/http_server/mod_actions.erl
index d879328876..154fde294e 100644
--- a/lib/inets/src/http_server/mod_actions.erl
+++ b/lib/inets/src/http_server/mod_actions.erl
@@ -81,18 +81,18 @@ script(RequestURI, Method, [_ | Rest]) ->
 %% load
 
 load("Action "++  Action, []) ->
-  case inets_regexp:split(Action, " ") of
-    {ok,[MimeType, CGIScript]} ->
-      {ok,[],{action, {MimeType, CGIScript}}};
-    {ok,_} ->
-      {error,?NICE(string:strip(Action)++" is an invalid Action")}
+  case re:split(Action, " ", [{return, list}]) of
+      [MimeType, CGIScript] ->
+	  {ok,[],{action, {MimeType, CGIScript}}};
+      _ ->
+	  {error,?NICE(string:strip(Action)++" is an invalid Action")}
   end;
 load("Script " ++ Script,[]) ->
-  case inets_regexp:split(Script, " ") of
-    {ok,[Method, CGIScript]} ->
-      {ok,[],{script, {Method, CGIScript}}};
-    {ok,_} ->
-      {error,?NICE(string:strip(Script)++" is an invalid Script")}
+  case re:split(Script, " ", [{return, list}]) of
+      [Method, CGIScript] ->
+	  {ok,[],{script, {Method, CGIScript}}};
+      _ ->
+	  {error,?NICE(string:strip(Script)++" is an invalid Script")}
   end.
 
 store({action, {MimeType, CGIScript}} = Conf, _) when is_list(MimeType),
diff --git a/lib/inets/src/http_server/mod_alias.erl b/lib/inets/src/http_server/mod_alias.erl
index 8dd4871821..77045259d3 100644
--- a/lib/inets/src/http_server/mod_alias.erl
+++ b/lib/inets/src/http_server/mod_alias.erl
@@ -146,7 +146,7 @@ real_script_name(_ConfigDB, _RequestURI, []) ->
 
 real_script_name(ConfigDB, RequestURI, [{MP,Replacement} | Rest])
   when element(1, MP) =:= re_pattern ->
-    case re:run(RequestURI, MP, [{capture,[]}]) of
+    case re:run(RequestURI, MP, [{capture, none}]) of
 	match ->
 	    ActualName =
 		re:replace(RequestURI, MP, Replacement, [{return,list}]),
@@ -156,10 +156,10 @@ real_script_name(ConfigDB, RequestURI, [{MP,Replacement} | Rest])
     end;
 
 real_script_name(ConfigDB, RequestURI, [{FakeName,RealName} | Rest]) ->
-    case inets_regexp:match(RequestURI, "^" ++ FakeName) of
-	{match,_,_} ->
-	    {ok, ActualName, _} = 
-		inets_regexp:sub(RequestURI, "^" ++ FakeName, RealName),
+    case re:run(RequestURI, "^" ++ FakeName, [{capture, none}]) of
+	match ->
+	    ActualName = 
+		re:replace(RequestURI, "^" ++ FakeName, RealName,  [{return,list}]),
 	    httpd_util:split_script_path(default_index(ConfigDB, ActualName));
 	nomatch ->
 	    real_script_name(ConfigDB, RequestURI, Rest)
@@ -206,26 +206,26 @@ path(Data, ConfigDB, RequestURI) ->
 %% load
 
 load("DirectoryIndex " ++ DirectoryIndex, []) ->
-    {ok, DirectoryIndexes} = inets_regexp:split(DirectoryIndex," "),
+    DirectoryIndexes = re:split(DirectoryIndex," ", [{return, list}]),
     {ok,[], {directory_index, DirectoryIndexes}};
 load("Alias " ++ Alias, []) ->
-    case inets_regexp:split(Alias," ") of
-	{ok, [FakeName, RealName]} ->
+    case re:split(Alias," ", [{return, list}]) of
+	[FakeName, RealName] ->
 	    {ok,[],{alias,{FakeName,RealName}}};
-	{ok, _} ->
+	_ ->
 	    {error,?NICE(string:strip(Alias)++" is an invalid Alias")}
     end;
 load("ReWrite " ++ Rule, Acc) ->
     load_re_write(Rule, Acc, "ReWrite", re_write);
 load("ScriptAlias " ++ ScriptAlias, []) ->
-    case inets_regexp:split(ScriptAlias, " ") of
-	{ok, [FakeName, RealName]} ->
+    case re:split(ScriptAlias, " ", [{return, list}]) of
+	[FakeName, RealName] ->
 	    %% Make sure the path always has a trailing slash..
 	    RealName1 = filename:join(filename:split(RealName)),
 	    {ok, [], {script_alias, {FakeName, RealName1++"/"}}};
-	{ok, _} ->
+	_ ->
 	    {error, ?NICE(string:strip(ScriptAlias)++
-			  " is an invalid ScriptAlias")}
+			      " is an invalid ScriptAlias")}
     end;
 load("ScriptReWrite " ++ Rule, Acc) ->
     load_re_write(Rule, Acc, "ScriptReWrite", script_re_write).
diff --git a/lib/inets/src/http_server/mod_auth.erl b/lib/inets/src/http_server/mod_auth.erl
index 6195e1c69f..b03629cabe 100644
--- a/lib/inets/src/http_server/mod_auth.erl
+++ b/lib/inets/src/http_server/mod_auth.erl
@@ -168,38 +168,38 @@ load("AuthDBType " ++ Type,
     end;
 
 load("require " ++ Require,[{directory, {Directory, DirData}}|Rest]) ->
-    case inets_regexp:split(Require," ") of
-	{ok,["user"|Users]} ->
+    case re:split(Require," ", [{return, list}]) of
+	["user" | Users] ->
 	    {ok,[{directory, {Directory,
-		  [{require_user,Users}|DirData]}} | Rest]};
-	{ok,["group"|Groups]} ->
+			      [{require_user,Users}|DirData]}} | Rest]};
+	["group"|Groups] ->
 	    {ok,[{directory, {Directory,
-		  [{require_group,Groups}|DirData]}} | Rest]};
-	{ok,_} ->
+			      [{require_group,Groups}|DirData]}} | Rest]};
+	_ ->
 	    {error,?NICE(string:strip(Require) ++" is an invalid require")}
     end;
 
 load("allow " ++ Allow,[{directory, {Directory, DirData}}|Rest]) ->
-    case inets_regexp:split(Allow," ") of
-	{ok,["from","all"]} ->
+    case re:split(Allow," ", [{return, list}]) of
+	["from","all"] ->
 	    {ok,[{directory, {Directory,
 		  [{allow_from,all}|DirData]}} | Rest]};
-	{ok,["from"|Hosts]} ->
+	["from"|Hosts] ->
 	    {ok,[{directory, {Directory,
 		  [{allow_from,Hosts}|DirData]}} | Rest]};
-	{ok,_} ->
+	_ ->
 	    {error,?NICE(string:strip(Allow) ++" is an invalid allow")}
     end;
 
 load("deny " ++ Deny,[{directory, {Directory, DirData}}|Rest]) ->
-    case inets_regexp:split(Deny," ") of
-	{ok, ["from", "all"]} ->
+    case re:split(Deny," ", [{return, list}]) of
+	["from", "all"] ->
 	    {ok,[{{directory, Directory,
 		  [{deny_from, all}|DirData]}} | Rest]};
-	{ok, ["from"|Hosts]} ->
+	["from"|Hosts] ->
 	    {ok,[{{directory, Directory,
 		   [{deny_from, Hosts}|DirData]}} | Rest]};
-	{ok, _} ->
+	_ ->
 	    {error,?NICE(string:strip(Deny) ++" is an invalid deny")}
     end;
 
@@ -561,12 +561,12 @@ secret_path(_Path, [], to_be_found) ->
 secret_path(_Path, [], Directory) ->
     {yes, Directory};
 secret_path(Path, [[NewDirectory] | Rest], Directory) ->
-    case inets_regexp:match(Path, NewDirectory) of
-	{match, _, _} when Directory =:= to_be_found ->
+    case re:run(Path, NewDirectory, [{capture, first}]) of
+	{match, _} when Directory =:= to_be_found ->
 	    secret_path(Path, Rest, NewDirectory);
-	{match, _, Length} when Length > length(Directory)->
+	{match, [{_, Length}]} when Length > length(Directory)->
 	    secret_path(Path, Rest,NewDirectory);
-	{match, _, _Length} ->
+	{match, _} ->
 	    secret_path(Path, Rest, Directory);
 	nomatch ->
 	    secret_path(Path, Rest, Directory)
@@ -588,8 +588,8 @@ validate_addr(_RemoteAddr, none) ->           % When called from 'deny'
 validate_addr(_RemoteAddr, []) ->
     false;
 validate_addr(RemoteAddr, [HostRegExp | Rest]) ->
-    case inets_regexp:match(RemoteAddr, HostRegExp) of
-	{match,_,_} ->
+    case re:run(RemoteAddr, HostRegExp, [{capture, none}]) of
+	match ->
 	    true;
 	nomatch ->
 	    validate_addr(RemoteAddr,Rest)
diff --git a/lib/inets/src/http_server/mod_auth_plain.erl b/lib/inets/src/http_server/mod_auth_plain.erl
index e85d3b8776..1a3120e03c 100644
--- a/lib/inets/src/http_server/mod_auth_plain.erl
+++ b/lib/inets/src/http_server/mod_auth_plain.erl
@@ -244,11 +244,11 @@ parse_group(Stream, GroupList, "") ->
 parse_group(Stream, GroupList, [$#|_]) ->
     parse_group(Stream, GroupList);
 parse_group(Stream, GroupList, Line) ->      
-    case inets_regexp:split(Line, ":") of
-	{ok, [Group,Users]} ->
-	    {ok, UserList} = inets_regexp:split(Users," "),
+    case re:split(Line, ":", [{return, list}]) of
+	[Group,Users] ->
+	    UserList = re:split(Users," ", [{return, list}]),
 	    parse_group(Stream, [{Group,UserList}|GroupList]);
-	{ok, _} ->
+	_ ->
 	    {error, ?NICE(Line)}
     end.
 
@@ -278,10 +278,10 @@ parse_passwd(Stream, PasswdList, "") ->
 parse_passwd(Stream, PasswdList, [$#|_]) ->
     parse_passwd(Stream, PasswdList);
 parse_passwd(Stream, PasswdList, Line) ->      
-    case inets_regexp:split(Line,":") of
-	{ok, [User,Password]} ->
+    case re:split(Line,":", [{return, list}]) of
+	[User,Password] ->
 	    parse_passwd(Stream, [{User,Password, []}|PasswdList]);
-	{ok,_} ->
+	_ ->
 	    {error, ?NICE(Line)}
     end.
 
diff --git a/lib/inets/src/http_server/mod_browser.erl b/lib/inets/src/http_server/mod_browser.erl
index ca643ab728..e3c41793ae 100644
--- a/lib/inets/src/http_server/mod_browser.erl
+++ b/lib/inets/src/http_server/mod_browser.erl
@@ -98,9 +98,9 @@ getBrowser1(Info) ->
 
 getBrowser(AgentString) ->
     LAgentString = http_util:to_lower(AgentString),
-    case inets_regexp:first_match(LAgentString,"^[^ ]*") of
-	{match,Start,Length} ->
-	    Browser = lists:sublist(LAgentString,Start,Length),
+    case re:run(LAgentString,"^[^ ]*", [{capture, first}]) of
+	{match,[{Start,Length}]} ->
+	    Browser = lists:sublist(LAgentString,Start+1,Length),
 	    case browserType(Browser) of
 		{mozilla,Vsn} ->
 		    {getMozilla(LAgentString,
@@ -164,8 +164,8 @@ operativeSystem(OpString,[{RetVal,RegExps}|Rest]) ->
 controlOperativeSystem(_OpString,[]) ->
     false;
 controlOperativeSystem(OpString,[Regexp|Regexps]) ->
-    case inets_regexp:match(OpString,Regexp) of
-	{match,_,_} ->
+    case re:run(OpString,Regexp, [{capture, none}]) of
+	match ->
 	    true;
 	nomatch ->
 	    controlOperativeSystem(OpString,Regexps)
@@ -182,18 +182,19 @@ controlOperativeSystem(OpString,[Regexp|Regexps]) ->
 getMozilla(_AgentString,[],Default) ->
     Default;
 getMozilla(AgentString,[{Agent,AgentRegExp}|Rest],Default) ->
-    case inets_regexp:match(AgentString,AgentRegExp) of
-	{match,_,_} ->
+    case re:run(AgentString,AgentRegExp, [{capture, none}]) of
+	match ->
 	    {Agent,getMozVersion(AgentString,AgentRegExp)};
 	nomatch ->
 	    getMozilla(AgentString,Rest,Default)
     end.
 
 getMozVersion(AgentString, AgentRegExp) ->
-    case inets_regexp:match(AgentString,AgentRegExp++"[0-9\.\ \/]*") of
-	{match,Start,Length} when length(AgentRegExp) < Length ->
+    case re:run(AgentString,AgentRegExp++"[0-9\.\ \/]*", 
+		[{capture, first}]) of
+	{match, [{Start,Length}]} when length(AgentRegExp) < Length ->
 	    %% Ok we got the number split it out
-	    RealStart  = Start+length(AgentRegExp),
+	    RealStart  = Start+1+length(AgentRegExp),
 	    RealLength = Length-length(AgentRegExp),
 	    VsnString  = string:substr(AgentString,RealStart,RealLength),
 	    %% case string:strip(VsnString,both,$\ ) of
diff --git a/lib/inets/src/http_server/mod_dir.erl b/lib/inets/src/http_server/mod_dir.erl
index 9d848ac013..2d8f27af3c 100644
--- a/lib/inets/src/http_server/mod_dir.erl
+++ b/lib/inets/src/http_server/mod_dir.erl
@@ -125,12 +125,13 @@ header(Path,RequestURI) ->
 	RequestURI ++ "</H1>\n<PRE><IMG SRC=\"" ++ icon(blank) ++
 	"\" ALT="     "> Name                   Last modified         "
 	"Size  Description <HR>\n",
-    case inets_regexp:sub(RequestURI,"[^/]*\$","") of
-	{ok,"/",_} ->
+    case re:replace(RequestURI,"[^/]*\$","", [{return,list}]) of
+	"/" ->
 	    Header;
-	{ok,ParentRequestURI,_} ->
-	    {ok,ParentPath,_} =
-		inets_regexp:sub(string:strip(Path,right,$/),"[^/]*\$",""),
+	ParentRequestURI ->
+	    ParentPath =
+		re:replace(string:strip(Path,right,$/),"[^/]*\$","",
+			   [{return,list}]),
 	    Header++format(ParentPath,ParentRequestURI)
     end.
 
diff --git a/lib/inets/src/http_server/mod_disk_log.erl b/lib/inets/src/http_server/mod_disk_log.erl
index a0ff929a34..5e395a2118 100644
--- a/lib/inets/src/http_server/mod_disk_log.erl
+++ b/lib/inets/src/http_server/mod_disk_log.erl
@@ -138,8 +138,8 @@ do(Info) ->
 %% Description: See httpd(3) ESWAPI CALLBACK FUNCTIONS
 %%-------------------------------------------------------------------------
 load("TransferDiskLogSize " ++ TransferDiskLogSize, []) ->
-    case inets_regexp:split(TransferDiskLogSize," ") of
-	{ok,[MaxBytes,MaxFiles]} ->
+    try re:split(TransferDiskLogSize, " ",  [{return, list}]) of
+	[MaxBytes, MaxFiles] ->
 	    case make_integer(MaxBytes) of
 		{ok,MaxBytesInteger} ->
 		    case make_integer(MaxFiles) of
@@ -151,17 +151,20 @@ load("TransferDiskLogSize " ++ TransferDiskLogSize, []) ->
 			     ?NICE(string:strip(TransferDiskLogSize)++
 				   " is an invalid TransferDiskLogSize")}
 		    end;
-		{error,_} ->
+		_ ->
 		    {error,?NICE(string:strip(TransferDiskLogSize)++
-				 " is an invalid TransferDiskLogSize")}
+				     " is an invalid TransferDiskLogSize")}
 	    end
+    catch _:_ ->
+	    {error,?NICE(string:strip(TransferDiskLogSize) ++
+			     " is an invalid TransferDiskLogSize")}   
     end;
 load("TransferDiskLog " ++ TransferDiskLog,[]) ->
     {ok,[],{transfer_disk_log,string:strip(TransferDiskLog)}};
  
 load("ErrorDiskLogSize " ++  ErrorDiskLogSize, []) ->
-    case inets_regexp:split(ErrorDiskLogSize," ") of
-	{ok,[MaxBytes,MaxFiles]} ->
+    try re:split(ErrorDiskLogSize," ", [{return, list}]) of
+	[MaxBytes,MaxFiles] ->
 	    case make_integer(MaxBytes) of
 		{ok,MaxBytesInteger} ->
 		    case make_integer(MaxFiles) of
@@ -176,13 +179,16 @@ load("ErrorDiskLogSize " ++  ErrorDiskLogSize, []) ->
 		    {error,?NICE(string:strip(ErrorDiskLogSize)++
 				 " is an invalid ErrorDiskLogSize")}
 	    end
+    catch _:_ ->
+	    {error,?NICE(string:strip(ErrorDiskLogSize) ++
+			     " is an invalid TransferDiskLogSize")}   
     end;
 load("ErrorDiskLog " ++ ErrorDiskLog, []) ->
     {ok, [], {error_disk_log, string:strip(ErrorDiskLog)}};
 
 load("SecurityDiskLogSize " ++ SecurityDiskLogSize, []) ->
-    case inets_regexp:split(SecurityDiskLogSize, " ") of
-	{ok, [MaxBytes, MaxFiles]} ->
+    try re:split(SecurityDiskLogSize, " ", [{return, list}]) of
+	[MaxBytes, MaxFiles] ->
 	    case make_integer(MaxBytes) of
 		{ok, MaxBytesInteger} ->
 		    case make_integer(MaxFiles) of
@@ -198,6 +204,9 @@ load("SecurityDiskLogSize " ++ SecurityDiskLogSize, []) ->
 		    {error, ?NICE(string:strip(SecurityDiskLogSize) ++
 				  " is an invalid SecurityDiskLogSize")}
 	    end
+    catch _:_ ->
+	    {error,?NICE(string:strip(SecurityDiskLogSize) ++
+			     " is an invalid SecurityDiskLogSize")}   	
     end;
 load("SecurityDiskLog " ++ SecurityDiskLog, []) ->
     {ok, [], {security_disk_log, string:strip(SecurityDiskLog)}};
diff --git a/lib/inets/src/http_server/mod_esi.erl b/lib/inets/src/http_server/mod_esi.erl
index b9a0797977..f8baa90fd4 100644
--- a/lib/inets/src/http_server/mod_esi.erl
+++ b/lib/inets/src/http_server/mod_esi.erl
@@ -96,26 +96,27 @@ do(ModData) ->
 %% Description: See httpd(3) ESWAPI CALLBACK FUNCTIONS
 %%-------------------------------------------------------------------------
 load("ErlScriptAlias " ++ ErlScriptAlias, []) ->
-    case inets_regexp:split(ErlScriptAlias," ") of
-	{ok, [ErlName | StrModules]} ->
+    try re:split(ErlScriptAlias," ", [{return, list}]) of
+	[ErlName | StrModules] ->
 	    Modules = lists:map(fun(Str) -> 
 					list_to_atom(string:strip(Str)) 
 				end, StrModules),
-	    {ok, [], {erl_script_alias, {ErlName, Modules}}};
-	{ok, _} ->
+	    {ok, [], {erl_script_alias, {ErlName, Modules}}}
+    catch _:_ ->
 	    {error, ?NICE(string:strip(ErlScriptAlias) ++
-			 " is an invalid ErlScriptAlias")}
+			      " is an invalid ErlScriptAlias")}
     end;
 load("EvalScriptAlias " ++ EvalScriptAlias, []) ->
-    case inets_regexp:split(EvalScriptAlias, " ") of
-	{ok, [EvalName | StrModules]} ->
+    try re:split(EvalScriptAlias, " ",  [{return, list}]) of
+	[EvalName | StrModules] ->
 	    Modules = lists:map(fun(Str) -> 
 					list_to_atom(string:strip(Str)) 
 				end, StrModules),
-	    {ok, [], {eval_script_alias, {EvalName, Modules}}};
-	{ok, _} ->
+	    {ok, [], {eval_script_alias, {EvalName, Modules}}}
+    catch 
+	_:_ ->
 	    {error, ?NICE(string:strip(EvalScriptAlias) ++
-			  " is an invalid EvalScriptAlias")}
+			      " is an invalid EvalScriptAlias")}
     end;
 load("ErlScriptTimeout " ++ Timeout, [])->
     case catch list_to_integer(string:strip(Timeout)) of
@@ -224,8 +225,8 @@ match_esi_script(_, [], _) ->
     no_match;
 match_esi_script(RequestURI, [{Alias,Modules} | Rest], AliasType) ->
     AliasMatchStr = alias_match_str(Alias, AliasType),
-    case inets_regexp:first_match(RequestURI, AliasMatchStr) of
-	{match, 1, Length} ->
+    case re:run(RequestURI, AliasMatchStr, [{capture, first}]) of
+	{match, [{0, Length}]} ->
 	    {string:substr(RequestURI, Length + 1), Modules};
 	nomatch ->
 	    match_esi_script(RequestURI, Rest, AliasType)
@@ -567,9 +568,9 @@ generate_webpage(ESIBody) ->
 is_authorized(_ESIBody, [all]) ->
     true;
 is_authorized(ESIBody, Modules) ->
-    case inets_regexp:match(ESIBody, "^[^\:(%3A)]*") of
-	{match, Start, Length} ->
-	    lists:member(list_to_atom(string:substr(ESIBody, Start, Length)),
+    case re:run(ESIBody, "^[^\:(%3A)]*", [{capture, first}]) of
+	{match, [{Start, Length}]} ->
+	    lists:member(list_to_atom(string:substr(ESIBody, Start+1, Length)),
 			 Modules);
 	nomatch ->
 	    false
diff --git a/lib/inets/src/http_server/mod_htaccess.erl b/lib/inets/src/http_server/mod_htaccess.erl
index c6ae20ced7..f229c96f2d 100644
--- a/lib/inets/src/http_server/mod_htaccess.erl
+++ b/lib/inets/src/http_server/mod_htaccess.erl
@@ -327,9 +327,9 @@ memberNetwork(Networks,UserNetwork,IfTrue,IfFalse)->
 %ipadresses or subnet addresses.
 memberNetwork(Networks,UserNetwork)->
     case lists:filter(fun(Net)->
-			      case inets_regexp:match(UserNetwork,
-						formatRegexp(Net)) of
-				  {match,1,_}->
+			      case re:run(UserNetwork,
+					  formatRegexp(Net), [{capture, first}]) of
+				  {match,[{0,_}]}->
 				      true;
 				  _NotSubNet ->
 				      false
@@ -638,13 +638,8 @@ getHtAccessFileNames(Info)->
 %HtAccessFileNames=["accessfileName1",..."AccessFileName2"]
 %----------------------------------------------------------------------
 getData(Path,Info,HtAccessFileNames)->	    
-    case inets_regexp:split(Path,"/") of
-	{error,Error}->
-	    {error,Error};
-	{ok,SplittedPath}->
-	    getData2(HtAccessFileNames,SplittedPath,Info)
-	end.
-
+    SplittedPath = re:split(Path, "/", [{return, list}]),
+    getData2(HtAccessFileNames,SplittedPath,Info).
 
 %----------------------------------------------------------------------
 %Add to together the data in the Splittedpath up to the path 
@@ -942,20 +937,16 @@ getAuthorizationType(AuthType)->
 %Returns a list of the specified methods to limit or the atom all
 %----------------------------------------------------------------------
 getLimits(Limits)->
-    case inets_regexp:split(Limits,">")of
-	{ok,[_NoEndOnLimit]}->
+    case re:split(Limits,">", [{return, list}])of
+	[_NoEndOnLimit]->
 	    error;
-	{ok, [Methods | _Crap]}->
-	    case inets_regexp:split(Methods," ") of
-		{ok,[]}->
+	[Methods | _Crap]->
+	    case re:split(Methods," ",  [{return, list}]) of
+		[[]]->
 		    all;
-		{ok,SplittedMethods}->
-		    SplittedMethods;
-		{error, _Error}->
-		    error
-	    end;
-	{error,_Error}->
-	    error
+		SplittedMethods ->
+		    SplittedMethods
+	    end
     end.
 
 
diff --git a/lib/inets/src/http_server/mod_security.erl b/lib/inets/src/http_server/mod_security.erl
index 20f87619c1..1f936d598a 100644
--- a/lib/inets/src/http_server/mod_security.erl
+++ b/lib/inets/src/http_server/mod_security.erl
@@ -273,12 +273,12 @@ secret_path(_Path, [], to_be_found) ->
 secret_path(_Path, [], Dir) ->
     {yes, Dir};
 secret_path(Path, [[NewDir]|Rest], Dir) ->
-    case inets_regexp:match(Path, NewDir) of
-	{match, _, _} when Dir =:= to_be_found ->
+    case re:run(Path, NewDir, [{capture, first}]) of
+	{match, _} when Dir =:= to_be_found ->
 	    secret_path(Path, Rest, NewDir);
-	{match, _, Length} when Length > length(Dir) ->
+	{match, [{_, Length}]} when Length > length(Dir) ->
 	    secret_path(Path, Rest, NewDir);
-	{match, _, _} ->
+	{match, _} ->
 	    secret_path(Path, Rest, Dir);
 	nomatch ->
 	    secret_path(Path, Rest, Dir)