← Back to branch summary

~ubuntu-branches/ubuntu/lucid/erlang/lucid-proposed

« back to all changes in this revision

Viewing changes to lib/inets/src/http_server/mod_htaccess.erl

  • Committer: Bazaar Package Importer
  • Author(s): Sergei Golovan
  • Date: 2009-06-11 12:18:07 UTC
  • mfrom: (1.2.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20090611121807-ks7eb4xrt7dsysgx
Tags: 1:13.b.1-dfsg-1
http://bugs.debian.org/529512
* New upstream release.
* Removed unnecessary dependency of erlang-os-mon on erlang-observer and
  erlang-tools and added missing dependency of erlang-nox on erlang-os-mon
  (closes: #529512).
* Removed a patch to eunit application because the bug was fixed upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/inets/src/http_server/mod_htaccess.erl
325
325
%ipadresses or subnet addresses.
326
326
memberNetwork(Networks,UserNetwork)->
327
327
    case lists:filter(fun(Net)->
328
 
                              case regexp:match(UserNetwork,
 
328
                              case inets_regexp:match(UserNetwork,
329
329
                                                formatRegexp(Net)) of
330
330
                                  {match,1,_}->
331
331
                                      true;
534
534
%----------------------------------------------------------------------
535
535
getUsers({stream,File},FileData,UserOrGroup)->
536
536
    case io:get_line(File,[]) of
537
 
        eof when UserOrGroup==user_file->
 
537
        eof when UserOrGroup =:= user_file ->
538
538
            {user_data,FileData};
539
 
        eof when UserOrGroup ==group_file->
 
539
        eof when UserOrGroup =:= group_file ->
540
540
           {group_data,FileData};
541
541
        Line ->
542
542
            getUsers({stream,File},
558
558
%----------------------------------------------------------------------
559
559
formatUser(UserData,FileData,UserOrGroup)->
560
560
    case string:tokens(UserData," \r\n")of
561
 
        [User| _Whitespace] when UserOrGroup==user_file->
 
561
        [User| _Whitespace] when UserOrGroup =:= user_file ->
562
562
            case string:tokens(User,":") of
563
563
                [Name,PassWord]->
564
564
                    [{user,Name,PassWord}|FileData];
565
565
                _Error->
566
566
                    FileData
567
567
            end;
568
 
        GroupData when UserOrGroup==group_file ->
 
568
        GroupData when UserOrGroup =:= group_file ->
569
569
            parseGroupData(GroupData,FileData);
570
570
        _Error ->
571
571
            FileData
636
636
%HtAccessFileNames=["accessfileName1",..."AccessFileName2"]
637
637
%----------------------------------------------------------------------
638
638
getData(Path,Info,HtAccessFileNames)->      
639
 
    case regexp:split(Path,"/") of
 
639
    case inets_regexp:split(Path,"/") of
640
640
        {error,Error}->
641
641
            {error,Error};
642
642
        {ok,SplittedPath}->
710
710
 
711
711
insertContext(AccessData,[{require,{GrpOrUsr,Members}}|Values])->    
712
712
    case ets:lookup(AccessData,require) of
713
 
        []when GrpOrUsr==users->
 
713
        [] when GrpOrUsr =:= users ->
714
714
            ets:insert(AccessData,{require,{{users,Members},{groups,[]}}});
715
715
 
716
 
        [{require,{{users,Users},{groups,Groups}}}]when GrpOrUsr==users ->
 
716
        [{require,{{users,Users},{groups,Groups}}}] when GrpOrUsr =:= users ->
717
717
            ets:insert(AccessData,{require,{{users,Users++Members},
718
718
                                           {groups,Groups}}});
719
 
        []when GrpOrUsr==groups->
 
719
        [] when GrpOrUsr =:= groups ->
720
720
            ets:insert(AccessData,{require,{{users,[]},{groups,Members}}});
721
721
 
722
 
        [{require,{{users,Users},{groups,Groups}}}]when GrpOrUsr==groups ->
 
722
        [{require,{{users,Users},{groups,Groups}}}] when GrpOrUsr =:= groups ->
723
723
            ets:insert(AccessData,{require,{{users,Users},
724
724
                                           {groups,Groups++Members}}})    
725
725
    end,
826
826
            lists:foreach(fun(Elem)->
827
827
                                  ets:insert(AccessData,Elem)
828
828
                          end,FileData);
829
 
        [{allow_over_ride,Directives}]when list(Directives)->
830
 
            lists:foreach(fun({Key,Value})->
 
829
        [{allow_over_ride,Directives}] when is_list(Directives)->
 
830
            lists:foreach(fun({Key,Value}) ->
831
831
                                  case lists:member(Key,Directives) of
832
832
                                      true->
833
833
                                          ok;
940
940
%Returns a list of the specified methods to limit or the atom all
941
941
%----------------------------------------------------------------------
942
942
getLimits(Limits)->
943
 
    case regexp:split(Limits,">")of
 
943
    case inets_regexp:split(Limits,">")of
944
944
        {ok,[_NoEndOnLimit]}->
945
945
            error;
946
946
        {ok, [Methods | _Crap]}->
947
 
            case regexp:split(Methods," ")of
 
947
            case inets_regexp:split(Methods," ") of
948
948
                {ok,[]}->
949
949
                    all;
950
950
                {ok,SplittedMethods}->
978
978
%----------------------------------------------------------------------
979
979
getAllowDenyData(AllowDeny)->
980
980
    case string:tokens(AllowDeny," \n\r") of
981
 
        [_From|AllowDenyData] when length(AllowDenyData)>=1->
 
981
        [_From|AllowDenyData] when length(AllowDenyData)>=1 ->
982
982
            case lists:nth(1,AllowDenyData) of
983
983
                "all" ->
984
984
                    all;