[svn] Merge of fix for bugs 20341 and 20410.

[wget] / src / res.h

diff --git a/src/res.h b/src/res.h
index da626ce252d0857bab8d1ee8a8dfacc17fa8beba..a05067768d0304d3b469122cedbbd25075b8f24f 100644 (file)
--- a/src/res.h
+++ b/src/res.h
@@ -5,7 +5,7 @@ This file is part of Wget.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

-the Free Software Foundation; either version 2 of the License, or
+the Free Software Foundation; either version 3 of the License, or

 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,


@@ -14,8 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License

-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+along with Wget.  If not, see <http://www.gnu.org/licenses/>.

 
 In addition, as a special exception, the Free Software Foundation
 gives permission to link the code of its release of Wget with the
 
 In addition, as a special exception, the Free Software Foundation
 gives permission to link the code of its release of Wget with the


@@ -42,6 +41,8 @@ struct robot_specs *res_get_specs (const char *, int);
 
 bool res_retrieve_file (const char *, char **);
 
 
 bool res_retrieve_file (const char *, char **);
 

+bool is_robots_txt_url (const char *);
+

 void res_cleanup (void);
 
 #endif /* RES_H */
 void res_cleanup (void);
 
 #endif /* RES_H */