From ba8d87765f490d99c9768dd116bb1a2e75354cc6 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Thu, 28 Jan 2016 15:44:15 +0100
Subject: inets: Use re instead of inets_regexp

---
 lib/inets/src/http_lib/http_uri.erl            |   8 +-
 lib/inets/src/http_server/httpd.erl            |  18 +-
 lib/inets/src/http_server/httpd_conf.erl       |  34 +-
 lib/inets/src/http_server/httpd_script_env.erl |   2 +-
 lib/inets/src/http_server/httpd_util.erl       |  29 +-
 lib/inets/src/http_server/mod_actions.erl      |  20 +-
 lib/inets/src/http_server/mod_alias.erl        |  26 +-
 lib/inets/src/http_server/mod_auth.erl         |  40 +--
 lib/inets/src/http_server/mod_auth_plain.erl   |  14 +-
 lib/inets/src/http_server/mod_browser.erl      |  21 +-
 lib/inets/src/http_server/mod_dir.erl          |  11 +-
 lib/inets/src/http_server/mod_disk_log.erl     |  25 +-
 lib/inets/src/http_server/mod_esi.erl          |  31 +-
 lib/inets/src/http_server/mod_htaccess.erl     |  35 +--
 lib/inets/src/http_server/mod_security.erl     |   8 +-
 lib/inets/src/inets_app/Makefile               |   1 -
 lib/inets/src/inets_app/inets.app.src          |   1 -
 lib/inets/src/inets_app/inets_regexp.erl       | 414 -------------------------
 lib/inets/src/tftp/tftp_engine.erl             |   4 +-
 lib/inets/src/tftp/tftp_lib.erl                |   4 +-
 lib/inets/test/httpd_1_1.erl                   |  42 +--
 lib/inets/test/httpd_poll.erl                  |   6 +-
 lib/inets/test/httpd_test_lib.erl              |  10 +-
 lib/inets/test/httpd_time_test.erl             |  22 +-
 24 files changed, 198 insertions(+), 628 deletions(-)
 delete mode 100644 lib/inets/src/inets_app/inets_regexp.erl

diff --git a/lib/inets/src/http_lib/http_uri.erl b/lib/inets/src/http_lib/http_uri.erl
index 79591eec29..bd8ca5f489 100644
--- a/lib/inets/src/http_lib/http_uri.erl
+++ b/lib/inets/src/http_lib/http_uri.erl
@@ -179,10 +179,10 @@ parse_host_port(_Scheme, DefaultPort, HostPort, _Opts) ->
     {Host, int_port(Port)}.
 
 split_uri(UriPart, SplitChar, NoMatchResult, SkipLeft, SkipRight) ->
-    case inets_regexp:first_match(UriPart, SplitChar) of
-	{match, Match, _} ->
-	    {string:substr(UriPart, 1, Match - SkipLeft),
-	     string:substr(UriPart, Match + SkipRight, length(UriPart))};
+    case re:run(UriPart, SplitChar, [{capture, first}]) of
+	{match, [{Match, _}]} ->
+	    {string:substr(UriPart, 1, Match + 1 - SkipLeft),
+	     string:substr(UriPart, Match + 1 + SkipRight, length(UriPart))};
 	nomatch ->
 	    NoMatchResult
     end.
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)
diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile
index 82cda6aaf0..0a4b625b6a 100644
--- a/lib/inets/src/inets_app/Makefile
+++ b/lib/inets/src/inets_app/Makefile
@@ -47,7 +47,6 @@ MODULES = \
 	inets_service \
 	inets_app \
 	inets_sup \
-	inets_regexp \
 	inets_trace \
 	inets_lib \
 	inets_time_compat
diff --git a/lib/inets/src/inets_app/inets.app.src b/lib/inets/src/inets_app/inets.app.src
index 2b9b8f5f32..e95f276bc4 100644
--- a/lib/inets/src/inets_app/inets.app.src
+++ b/lib/inets/src/inets_app/inets.app.src
@@ -26,7 +26,6 @@
             inets_sup,
             inets_app,
 	    inets_service,	                  
-	    inets_regexp,	                  
 	    inets_trace,
             inets_lib,
             inets_time_compat,
diff --git a/lib/inets/src/inets_app/inets_regexp.erl b/lib/inets/src/inets_app/inets_regexp.erl
deleted file mode 100644
index fc1608bc5a..0000000000
--- a/lib/inets/src/inets_app/inets_regexp.erl
+++ /dev/null
@@ -1,414 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2009. All Rights Reserved.
-%% 
-%% Licensed under the Apache License, Version 2.0 (the "License");
-%% you may not use this file except in compliance with the License.
-%% You may obtain a copy of the License at
-%%
-%%     http://www.apache.org/licenses/LICENSE-2.0
-%%
-%% Unless required by applicable law or agreed to in writing, software
-%% distributed under the License is distributed on an "AS IS" BASIS,
-%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%% See the License for the specific language governing permissions and
-%% limitations under the License.
-%% 
-%% %CopyrightEnd%
-%%
-
--module(inets_regexp).
-
--export([parse/1, match/2, first_match/2, split/2, sub/3, gsub/3]).
-
-
-%%%=========================================================================
-%%%  API
-%%%=========================================================================
-
-%% parse(RegExp) -> {ok, RE} | {error, E}.
-%% Parse the regexp described in the string RegExp.
-
-parse(S) ->
-    case (catch reg(S)) of
-	{R, []} -> 
-	    {ok, R};
-	{_R, [C|_]} -> 
-	    {error, {illegal, [C]}};
-	{error, E} -> 
-	    {error, E}
-    end.
-
-
-%% Find the longest match of RegExp in String.
-
-match(S, RegExp) when is_list(RegExp) ->
-    case parse(RegExp) of
-	{ok,RE} -> match(S, RE);
-	{error,E} -> {error,E}
-    end;
-match(S, RE) ->
-    case match(RE, S, 1, 0, -1) of
-	{Start,Len} when Len >= 0 ->
-	    {match, Start, Len};
-	{_Start,_Len} -> 
-	    nomatch
-    end.
-
-%% Find the first match of RegExp in String.
-
-first_match(S, RegExp) when is_list(RegExp) ->
-    case parse(RegExp) of
-	{ok, RE} -> 
-	    first_match(S, RE);
-	{error, E} -> 
-	    {error, E}
-    end;
-first_match(S, RE) ->
-    case first_match(RE, S, 1) of
-	{Start,Len} when Len >= 0 ->
-	    {match, Start,Len};
-	nomatch -> 
-	    nomatch
-    end.
-
-first_match(RE, S, St) when S =/= [] ->
-    case re_apply(S, St, RE) of
-	{match, P, _Rest} -> 
-	    {St, P-St};
-	nomatch -> 
-	    first_match(RE, tl(S), St+1)
-    end;
-first_match(_RE, [], _St) -> 
-    nomatch.
-
-
-match(RE, S, St, Pos, L) ->
-    case first_match(RE, S, St) of
-	{St1, L1} ->
-	    Nst = St1 + 1,
-	    if L1 > L -> 
-		    match(RE, lists:nthtail(Nst-St, S), Nst, St1, L1);
-	       true -> 
-		    match(RE, lists:nthtail(Nst-St, S), Nst, Pos, L)
-	    end;
-	nomatch -> 
-	    {Pos, L}
-    end.
-
-
-%% Split a string into substrings where the RegExp describes the
-%% field seperator. The RegExp " " is specially treated.
-
-split(String, " ") ->				%This is really special
-    {ok, RE} = parse("[ \t]+"),
-    case split_apply(String, RE, true) of
-	[[]|Ss] -> 
-	    {ok,Ss};
-	Ss -> 
-	    {ok,Ss}
-    end;
-split(String, RegExp) when is_list(RegExp) ->
-    case parse(RegExp) of
-	{ok, RE} -> 
-	    {ok, split_apply(String, RE, false)};
-	{error, E} -> 
-	    {error,E}
-    end;
-split(String, RE) -> 
-    {ok, split_apply(String, RE, false)}.
-
-
-%% Substitute the first match of the regular expression RegExp 
-%% with the string Replace in String. Accept pre-parsed regular
-%% expressions.
-
-sub(String, RegExp, Rep) when is_list(RegExp) ->
-    case parse(RegExp) of
-	{ok, RE} -> 
-	    sub(String, RE, Rep);
-	{error, E} -> 
-	    {error, E}
-    end;
-sub(String, RE, Rep) ->
-    Ss = sub_match(String, RE, 1),
-    {ok, sub_repl(Ss, Rep, String, 1), length(Ss)}.
-
-
-%% Substitute every match of the regular expression RegExp with 
-%% the string New in String. Accept pre-parsed regular expressions.
-
-gsub(String, RegExp, Rep) when is_list(RegExp) ->
-    case parse(RegExp) of
-	{ok, RE} -> 
-	    gsub(String, RE, Rep);
-	{error, E} -> 
-	    {error, E}
-    end;
-gsub(String, RE, Rep) ->
-    Ss = matches(String, RE, 1),
-    {ok, sub_repl(Ss, Rep, String, 1), length(Ss)}.
-
-
-%%%========================================================================
-%%% Internal functions
-%%%========================================================================
-
-%% This is the regular expression grammar used. It is equivalent to the
-%% one used in AWK, except that we allow ^ $ to be used anywhere and fail
-%% in the matching.
-%%
-%% reg -> reg1 : '$1'.
-%% reg1 -> reg1 "|" reg2 : {'or','$1','$2'}.
-%% reg1 -> reg2 : '$1'.
-%% reg2 -> reg2 reg3 : {concat,'$1','$2'}.
-%% reg2 -> reg3 : '$1'.
-%% reg3 -> reg3 "*" : {kclosure,'$1'}.
-%% reg3 -> reg3 "+" : {pclosure,'$1'}.
-%% reg3 -> reg3 "?" : {optional,'$1'}.
-%% reg3 -> reg4 : '$1'.
-%% reg4 -> "(" reg ")" : '$2'.
-%% reg4 -> "\\" char : '$2'.
-%% reg4 -> "^" : bos.
-%% reg4 -> "$" : eos.
-%% reg4 -> "." : char.
-%% reg4 -> "[" class "]" : {char_class,char_class('$2')}
-%% reg4 -> "[" "^" class "]" : {comp_class,char_class('$3')}
-%% reg4 -> "\"" chars "\"" : char_string('$2')
-%% reg4 -> char : '$1'.
-%% reg4 -> empty : epsilon.
-%%  The grammar of the current regular expressions. The actual parser
-%%  is a recursive descent implementation of the grammar.
-
-reg(S) -> reg1(S).
-
-%% reg1 -> reg2 reg1'
-%% reg1' -> "|" reg2
-%% reg1' -> empty
-
-reg1(S0) ->
-    {L,S1} = reg2(S0),
-    reg1p(S1, L).
-
-reg1p([$||S0], L) ->
-    {R,S1} = reg2(S0),
-    reg1p(S1, {'or',L,R});
-reg1p(S, L) -> {L,S}.
-
-%% reg2 -> reg3 reg2'
-%% reg2' -> reg3
-%% reg2' -> empty
-
-reg2(S0) ->
-    {L,S1} = reg3(S0),
-    reg2p(S1, L).
-
-reg2p([C|S0], L) when (C =/= $|) andalso (C =/= $)) ->
-    {R,S1} = reg3([C|S0]),
-    reg2p(S1, {concat,L,R});
-reg2p(S, L) -> {L,S}.
-
-%% reg3 -> reg4 reg3'
-%% reg3' -> "*" reg3'
-%% reg3' -> "+" reg3'
-%% reg3' -> "?" reg3'
-%% reg3' -> empty
-
-reg3(S0) ->
-    {L,S1} = reg4(S0),
-    reg3p(S1, L).
-
-reg3p([$*|S], L) -> reg3p(S, {kclosure,L});
-reg3p([$+|S], L) -> reg3p(S, {pclosure,L});
-reg3p([$?|S], L) -> reg3p(S, {optional,L});
-reg3p(S, L) -> {L,S}.
-
-reg4([$(|S0]) ->
-    case reg(S0) of
-	{R,[$)|S1]} -> {R,S1};
-	{_R,_S} -> throw({error,{unterminated,"("}})
-    end;
-reg4([$\\,O1,O2,O3|S]) 
-  when ((O1 >= $0) andalso 
-	(O1 =< $7) andalso 
-	(O2 >= $0) andalso 
-	(O2 =< $7) andalso 
-	(O3 >= $0) andalso 
-	(O3 =< $7)) ->
-    {(O1*8 + O2)*8 + O3 - 73*$0,S};
-reg4([$\\,C|S]) -> 
-    {escape_char(C),S};
-reg4([$\\]) -> 
-    throw({error, {unterminated,"\\"}});
-reg4([$^|S]) -> 
-    {bos,S};
-reg4([$$|S]) -> 
-    {eos,S};
-reg4([$.|S]) -> 
-    {{comp_class,"\n"},S};
-reg4("[^" ++ S0) ->
-    case char_class(S0) of
-	{Cc,[$]|S1]} -> {{comp_class,Cc},S1};
-	{_Cc,_S} -> throw({error,{unterminated,"["}})
-    end;
-reg4([$[|S0]) ->
-    case char_class(S0) of
-	{Cc,[$]|S1]} -> {{char_class,Cc},S1};
-	{_Cc,_S1} -> throw({error,{unterminated,"["}})
-    end;
-reg4([C|S]) 
-  when (C =/= $*) andalso (C =/= $+) andalso (C =/= $?) andalso (C =/= $]) -> 
-    {C, S};
-reg4([C|_S]) -> 
-    throw({error,{illegal,[C]}});
-reg4([]) -> 
-    {epsilon,[]}.
-
-escape_char($n) -> $\n;				%\n = LF
-escape_char($r) -> $\r;				%\r = CR
-escape_char($t) -> $\t;				%\t = TAB
-escape_char($v) -> $\v;				%\v = VT
-escape_char($b) -> $\b;				%\b = BS
-escape_char($f) -> $\f;				%\f = FF
-escape_char($e) -> $\e;				%\e = ESC
-escape_char($s) -> $\s;				%\s = SPACE
-escape_char($d) -> $\d;				%\d = DEL
-escape_char(C) -> C.
-
-char_class([$]|S]) -> char_class(S, [$]]);
-char_class(S) -> char_class(S, []).
-
-char($\\, [O1,O2,O3|S]) when
-  O1 >= $0, O1 =< $7, O2 >= $0, O2 =< $7, O3 >= $0, O3 =< $7 ->
-    {(O1*8 + O2)*8 + O3 - 73*$0,S};
-char($\\, [C|S]) -> {escape_char(C),S};
-char(C, S) -> {C,S}.
-
-char_class([C1|S0], Cc) when C1 =/= $] ->
-    case char(C1, S0) of
-	{Cf,[$-,C2|S1]} when C2 =/= $] ->
-	    case char(C2, S1) of
-		{Cl,S2} when Cf < Cl -> char_class(S2, [{Cf,Cl}|Cc]); 
-		{Cl,_S2} -> throw({error,{char_class,[Cf,$-,Cl]}})
-	    end;
-	{C,S1} -> char_class(S1, [C|Cc])
-    end;
-char_class(S, Cc) -> {Cc,S}.
-
-
-%% re_apply(String, StartPos, RegExp) -> re_app_res().
-%%
-%%  Apply the (parse of the) regular expression RegExp to String.  If
-%%  there is a match return the position of the remaining string and
-%%  the string if else return 'nomatch'. BestMatch specifies if we want
-%%  the longest match, or just a match.
-%%
-%%  StartPos should be the real start position as it is used to decide
-%%  if we ae at the beginning of the string.
-%%
-%%  Pass two functions to re_apply_or so it can decide, on the basis
-%%  of BestMatch, whether to just any take any match or try both to
-%%  find the longest. This is slower but saves duplicatng code.
-
-re_apply(S, St, RE) -> re_apply(RE, [], S, St).
-
-re_apply(epsilon, More, S, P) ->		%This always matches
-    re_apply_more(More, S, P);
-re_apply({'or',RE1,RE2}, More, S, P) ->
-    re_apply_or(re_apply(RE1, More, S, P),
-		re_apply(RE2, More, S, P));
-re_apply({concat,RE1,RE2}, More, S0, P) ->
-    re_apply(RE1, [RE2|More], S0, P);
-re_apply({kclosure,CE}, More, S, P) ->
-    %% Be careful with the recursion, explicitly do one call before
-    %% looping.
-    re_apply_or(re_apply_more(More, S, P),
-		re_apply(CE, [{kclosure,CE}|More], S, P));
-re_apply({pclosure,CE}, More, S, P) ->
-    re_apply(CE, [{kclosure,CE}|More], S, P);
-re_apply({optional,CE}, More, S, P) ->
-    re_apply_or(re_apply_more(More, S, P),
-		re_apply(CE, More, S, P));
-re_apply(bos, More, S, 1) -> re_apply_more(More, S, 1);
-re_apply(eos, More, [$\n|S], P) -> re_apply_more(More, S, P);
-re_apply(eos, More, [], P) -> re_apply_more(More, [], P);
-re_apply({char_class,Cc}, More, [C|S], P) ->
-    case in_char_class(C, Cc) of
-	true -> re_apply_more(More, S, P+1);
-	false -> nomatch
-    end;
-re_apply({comp_class,Cc}, More, [C|S], P) ->
-    case in_char_class(C, Cc) of
-	true -> nomatch;
-	false -> re_apply_more(More, S, P+1)
-    end;
-re_apply(C, More, [C|S], P) when is_integer(C) ->
-    re_apply_more(More, S, P+1);
-re_apply(_RE, _More, _S, _P) -> nomatch.
-
-%% re_apply_more([RegExp], String, Length) -> re_app_res().
-
-re_apply_more([RE|More], S, P) -> re_apply(RE, More, S, P);
-re_apply_more([], S, P) -> {match,P,S}.
-
-%% in_char_class(Char, Class) -> bool().
-
-in_char_class(C, [{C1,C2}|_Cc]) when C >= C1, C =< C2 -> true;
-in_char_class(C, [C|_Cc]) -> true;
-in_char_class(C, [_|Cc]) -> in_char_class(C, Cc);
-in_char_class(_C, []) -> false.
-
-%% re_apply_or(Match1, Match2) -> re_app_res().
-%%  If we want the best match then choose the longest match, else just
-%%  choose one by trying sequentially.
-
-re_apply_or({match,P1,S1},   {match,P2,_S2}) when P1 >= P2 -> {match,P1,S1};
-re_apply_or({match,_P1,_S1}, {match,P2,S2}) -> {match,P2,S2};
-re_apply_or(nomatch, R2) -> R2;
-re_apply_or(R1, nomatch) -> R1.
-
-
-matches(S, RE, St) ->
-    case first_match(RE, S, St) of
-	{St1,0} -> 
-	    [{St1,0}|matches(string:substr(S, St1+2-St), RE, St1+1)];
-	{St1,L1} -> 
-	    [{St1,L1}|matches(string:substr(S, St1+L1+1-St), RE, St1+L1)];
-	nomatch -> 
-	    []
-    end.
-
-sub_match(S, RE, St) ->
-    case first_match(RE, S, St) of
-	{St1,L1} -> [{St1,L1}];
-	nomatch -> []
-    end.
-
-sub_repl([{St,L}|Ss], Rep, S, Pos) ->
-    Rs = sub_repl(Ss, Rep, S, St+L),
-    string:substr(S, Pos, St-Pos) ++ 
-	sub_repl(Rep, string:substr(S, St, L), Rs);
-sub_repl([], _Rep, S, Pos) -> 
-    string:substr(S, Pos).
-
-sub_repl([$&|Rep], M, Rest) -> M ++ sub_repl(Rep, M, Rest);
-sub_repl("\\&" ++ Rep, M, Rest) -> [$&|sub_repl(Rep, M, Rest)];
-sub_repl([C|Rep], M, Rest) -> [C|sub_repl(Rep, M, Rest)];
-sub_repl([], _M, Rest) -> Rest.
-
-split_apply(S, RE, Trim) -> split_apply(S, 1, RE, Trim, []).
-
-split_apply([], _P, _RE, true, []) -> 
-    [];
-split_apply([], _P, _RE, _T, Sub) -> 
-    [lists:reverse(Sub)];
-split_apply(S, P, RE, T, Sub) ->
-    case re_apply(S, P, RE) of
-	{match,P,_Rest} ->
-	    split_apply(tl(S), P+1, RE, T, [hd(S)|Sub]);
-	{match,P1,Rest} ->
-	    [lists:reverse(Sub)|split_apply(Rest, P1, RE, T, [])];
-	nomatch ->
-	    split_apply(tl(S), P+1, RE, T, [hd(S)|Sub])
-    end.
diff --git a/lib/inets/src/tftp/tftp_engine.erl b/lib/inets/src/tftp/tftp_engine.erl
index d0510e795b..8d282a1e9d 100644
--- a/lib/inets/src/tftp/tftp_engine.erl
+++ b/lib/inets/src/tftp/tftp_engine.erl
@@ -1153,8 +1153,8 @@ match_callback(Filename, Callbacks) ->
     end.
 
 do_match_callback(Filename, [C | Tail]) when is_record(C, callback) ->
-    case catch inets_regexp:match(Filename, C#callback.internal) of
-        {match, _, _} ->
+    case catch re:run(Filename, C#callback.internal, [{capture, none}]) of
+        match ->
             {ok, C};
         nomatch ->
             do_match_callback(Filename, Tail);
diff --git a/lib/inets/src/tftp/tftp_lib.erl b/lib/inets/src/tftp/tftp_lib.erl
index 71327f8023..01dea97d07 100644
--- a/lib/inets/src/tftp/tftp_lib.erl
+++ b/lib/inets/src/tftp/tftp_lib.erl
@@ -184,7 +184,7 @@ do_parse_config([{Key, Val} | Tail], Config) when is_record(Config, config) ->
         callback ->
             case Val of
                 {RegExp, Mod, State} when is_list(RegExp), is_atom(Mod) ->
-                    case inets_regexp:parse(RegExp) of
+                    case re:compile(RegExp) of
                         {ok, Internal} ->
                             Callback = #callback{regexp   = RegExp,
                                                  internal = Internal,
@@ -253,7 +253,7 @@ do_parse_config(Options, Config) when is_record(Config, config) ->
 
 add_default_callbacks(Callbacks) ->
     RegExp = "",
-    {ok, Internal} = inets_regexp:parse(RegExp),
+    {ok, Internal} = re:compile(RegExp),
     File = #callback{regexp   = RegExp,
 		     internal = Internal,
 		     module   = tftp_file,
diff --git a/lib/inets/test/httpd_1_1.erl b/lib/inets/test/httpd_1_1.erl
index dd9d21bbfc..ae5fcba47b 100644
--- a/lib/inets/test/httpd_1_1.erl
+++ b/lib/inets/test/httpd_1_1.erl
@@ -361,18 +361,18 @@ validateRangeRequest2(Socket, Head, Body, ValidBody, BodySize)
 
 
 validateMultiPartRangeRequest(Body, ValidBody, Boundary)->
-    case inets_regexp:split(Body,"--"++Boundary++"--") of
+    case re:split(Body,"--"++Boundary++"--", [{return, list}]) of
 	%%Last is the epilogue and must be ignored 
-	{ok,[First | _Last]}->
+	[First | _Last]->
 	    %%First is now the actuall http request body.
-	    case inets_regexp:split(First, "--" ++ Boundary) of
+	    case re:split(First, "--" ++ Boundary, [{return, list}]) of
 		%%Parts is now a list of ranges and the heads for each range
 		%%Gues we try to split out the body
-		{ok,Parts}->
+		Parts->
 		    case lists:flatten(lists:map(fun splitRange/1,Parts)) of
 			ValidBody->
 			    ok;
-		       ParsedBody->
+			ParsedBody->
 			    error = ParsedBody
 		    end
 	    end;
@@ -382,8 +382,8 @@ validateMultiPartRangeRequest(Body, ValidBody, Boundary)->
 
 
 splitRange(Part)->	    
-    case inets_regexp:split(Part, "\r\n\r\n") of
-	{ok,[_, Body]} ->
+    case re:split(Part, "\r\n\r\n", [{return, list}]) of
+	[_, Body] ->
 	    string:substr(Body, 1, length(Body) - 2);
 	_ ->
 	    []
@@ -403,13 +403,13 @@ getRangeSize(Head)->
 	{multiPart, BoundaryString}->
 	    {multiPart, BoundaryString};
 	_X1 ->
-	    case inets_regexp:match(Head, ?CONTENT_RANGE "bytes=.*\r\n") of
-		{match, Start, Lenght} ->
+	    case re:run(Head, ?CONTENT_RANGE "bytes=.*\r\n", [{capture, first}]) of
+		{match, [{Start, Lenght}]} ->
 		    %% Get the range data remove the fieldname and the
 		    %% end of line.
-		    RangeInfo = string:substr(Head, Start + 20, 
-					      Lenght - (20 - 2)),
-		    rangeSize(RangeInfo);
+		    RangeInfo = string:substr(Head, Start + 1 + 20, 
+					      Lenght - (20 +2)),
+		    rangeSize(string:strip(RangeInfo));
 		_X2 ->
 		    error
 	    end
@@ -445,10 +445,10 @@ num(_CharVal, false) ->
     true.
 
 controlMimeType(Head)->
-    case inets_regexp:match(Head,?CONTENT_TYPE "multipart/byteranges.*\r\n") of
-	{match,Start,Length}->
+    case re:run(Head,?CONTENT_TYPE "multipart/byteranges.*\r\n", [{capture, first}]) of
+	{match, [{Start,Length}]}->
 	    FieldNameLen = length(?CONTENT_TYPE "multipart/byteranges"),
-	    case clearBoundary(string:substr(Head, Start + FieldNameLen,
+	    case clearBoundary(string:substr(Head, Start + 1 + FieldNameLen,
 					     Length - (FieldNameLen+2))) of
 		error ->
 		    error;
@@ -462,10 +462,10 @@ controlMimeType(Head)->
     end.
 
 clearBoundary(Boundary)->
-    case inets_regexp:match(Boundary, "boundary=.*\$") of
-	{match, Start1, Length1}->
+    case re:run(Boundary, "boundary=.*\$", [{capture, first}]) of
+	{match, [{Start1, Length1}]}->
 	    BoundLen = length("boundary="),
-	    string:substr(Boundary, Start1 + BoundLen, Length1 - BoundLen);
+	    string:substr(Boundary, Start1 + 1 + BoundLen, Length1 - BoundLen);
 	_ ->
 	    error
     end.
@@ -480,12 +480,12 @@ end_of_header(HeaderPart) ->
     end.
 
 get_body_size(Head) ->
-    case inets_regexp:match(Head,?CONTENT_LENGTH ".*\r\n") of
- 	{match, Start, Length} ->
+    case re:run(Head,?CONTENT_LENGTH ".*\r\n", [{capture, first}]) of
+ 	{match, [{Start, Length}]} ->
  	    %% 15 is length of Content-Length, 
  	    %% 17 Is length of Content-Length and \r\
  	    S = list_to_integer(
- 		  string:strip(string:substr(Head, Start + 15, Length-17))),
+ 		  string:strip(string:substr(Head, Start +1 + 15, Length-17))),
  	    S;
  	_->
  	    0
diff --git a/lib/inets/test/httpd_poll.erl b/lib/inets/test/httpd_poll.erl
index aca7b70376..4a570fb512 100644
--- a/lib/inets/test/httpd_poll.erl
+++ b/lib/inets/test/httpd_poll.erl
@@ -259,11 +259,11 @@ validate(ExpStatusCode,Socket,Response) ->
     vtrace("validate -> Entry with ~p bytes response",[Sz]),
     Size = trash_the_rest(Socket,Sz),
     close(Socket),
-    case inets_regexp:split(Response," ") of
-	{ok,["HTTP/1.0",ExpStatusCode|_]} ->
+    case re:split(Response," ", [{return, list}]) of
+	["HTTP/1.0",ExpStatusCode|_] ->
 	    vlog("response (~p bytes) was ok",[Size]),
 	    ok;
-	{ok,["HTTP/1.0",StatusCode|_]} -> 
+	["HTTP/1.0",StatusCode|_] -> 
 	    verror("unexpected response status received: ~s => ~s",
 		   [StatusCode,status_to_message(StatusCode)]),
 	    log("unexpected result to GET of '~s': ~s => ~s",
diff --git a/lib/inets/test/httpd_test_lib.erl b/lib/inets/test/httpd_test_lib.erl
index cb2e86c81e..8cc6f3bbd6 100644
--- a/lib/inets/test/httpd_test_lib.erl
+++ b/lib/inets/test/httpd_test_lib.erl
@@ -96,10 +96,10 @@ verify_request(SocketType, Host, Port, TranspOpts, Node, RequestStr, Options, Ti
     try inets_test_lib:connect_bin(SocketType, Host, Port, TranspOpts) of
 	{ok, Socket} ->
 	    ok = inets_test_lib:send(SocketType, Socket, RequestStr),
-	    State = case inets_regexp:match(RequestStr, "printenv") of
+	    State = case re:run(RequestStr, "printenv", [{capture, none}]) of
 			nomatch ->
 			    #state{};
-			_ ->
+			match ->
 			    #state{print = true}
 		    end,
 	    
@@ -311,10 +311,10 @@ do_validate(Header, [_Unknown | Rest], N, P) ->
     do_validate(Header, Rest, N, P).
 
 is_expect(RequestStr) ->
-    case inets_regexp:match(RequestStr, "xpect:100-continue") of
-	{match, _, _}->
+    case re:run(RequestStr, "xpect:100-continue", [{capture, none}]) of
+	match->
 	    true;
-	_ ->
+	nomatch ->
 	    false
     end.
 
diff --git a/lib/inets/test/httpd_time_test.erl b/lib/inets/test/httpd_time_test.erl
index 7c0acb5a99..1b4d74b28e 100644
--- a/lib/inets/test/httpd_time_test.erl
+++ b/lib/inets/test/httpd_time_test.erl
@@ -386,31 +386,31 @@ validate(ExpStatusCode, _SocketType, _Socket, Response) ->
     %% Sz = sz(Response),
     %% trash_the_rest(Socket, Sz),
     %% inets_test_lib:close(SocketType, Socket),
-    case inets_regexp:split(Response," ") of
-        {ok, ["HTTP/1.0", ExpStatusCode|_]} ->
+    case re:split(Response," ", [{return, list}]) of
+        ["HTTP/1.0", ExpStatusCode|_] ->
             ok;
-        {ok, ["HTTP/1.0", StatusCode|_]} -> 
+        ["HTTP/1.0", StatusCode|_] -> 
 	    error_msg("Unexpected status code: ~p (~s). "
 		      "Expected status code: ~p (~s)", 
 		      [StatusCode,    status_to_message(StatusCode),
 		       ExpStatusCode, status_to_message(ExpStatusCode)]),
             exit({unexpected_response_code, StatusCode, ExpStatusCode});
-	{ok, ["HTTP/1.1", ExpStatusCode|_]} ->
+	["HTTP/1.1", ExpStatusCode|_] ->
             ok;
-        {ok, ["HTTP/1.1", StatusCode|_]} -> 
+	["HTTP/1.1", StatusCode|_] -> 
 	    error_msg("Unexpected status code: ~p (~s). "
 		      "Expected status code: ~p (~s)", 
 		      [StatusCode,    status_to_message(StatusCode),
 		       ExpStatusCode, status_to_message(ExpStatusCode)]),
             exit({unexpected_response_code, StatusCode, ExpStatusCode});
-        {ok, Unexpected} -> 
-	    error_msg("Unexpected response split: ~p (~s)", 
-		      [Unexpected, Response]),
-            exit({unexpected_response, Unexpected, Response});
-        {error, Reason} -> 
+	{error, Reason} -> 
 	    error_msg("Failed processing response: ~p (~s)", 
 		      [Reason, Response]),
-            exit({failed_response_processing, Reason, Response})
+            exit({failed_response_processing, Reason, Response});
+	Unexpected ->
+	    error_msg("Unexpected response split: ~p (~s)", 
+		      [Unexpected, Response]),
+            exit({unexpected_response, Unexpected, Response})
     end.
 
 
-- 
cgit v1.2.3