← Back to branch summary

~ubuntu-branches/ubuntu/hardy/lighttpd/hardy

« back to all changes in this revision

Viewing changes to src/server.c

  • Committer: Bazaar Package Importer
  • Author(s): Jeremie Corbier
  • Date: 2006-09-22 19:16:08 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20060922191608-i9jngvf1wtf3j5rd
Tags: 1.4.12~20060907-1ubuntu1
Merge from debian unstable:
-> Keep the additional dependency on libterm-readline-perl-perl.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server.c
861
861
                        }
862
862
                }
863
863
        }
864
 
        
 
864
 
 
865
        if (srv->config_unsupported) {
 
866
                log_error_write(srv, __FILE__, __LINE__, "s", 
 
867
                                "Configuration contains unsupported keys. Going down.");
 
868
        }
 
869
 
865
870
        if (srv->config_deprecated) {
866
871
                log_error_write(srv, __FILE__, __LINE__, "s", 
867
872
                                "Configuration contains deprecated keys. Going down.");
868
 
                
 
873
        }
 
874
 
 
875
        if (srv->config_unsupported || srv->config_deprecated) {
869
876
                plugins_free(srv);
870
877
                network_close(srv);
871
878
                server_free(srv);
872
 
                
 
879
 
873
880
                return -1;
874
881
        }
875
 
        
 
882
 
876
883
        if (-1 == log_error_open(srv)) {
877
884
                log_error_write(srv, __FILE__, __LINE__, "s", 
878
885
                                "opening errorlog failed, dying");
879
 
                
 
886
 
880
887
                plugins_free(srv);
881
888
                network_close(srv);
882
889
                server_free(srv);