nagios-cgi-http_charset.patch

   1 --- nagios-3.0.3/base/config.c  2008-04-13 21:34:27.000000000 +0300
   2 +++ nagios-3.0.3-cgi/base/config.c      2008-10-11 12:34:44.464656939 +0300
   3 @@ -60,6 +60,7 @@
   4
   5  extern char     *illegal_object_chars;
   6  extern char     *illegal_output_chars;
   7 +extern char     *http_charset;
   8
   9  extern int      use_regexp_matches;
  10  extern int      use_true_regexp_matching;
  11 @@ -1211,6 +1212,8 @@
  12                 else if(!strcmp(variable,"illegal_macro_output_chars"))
  13                         illegal_output_chars=(char *)strdup(value);
  14
  15 +               else if(!strcmp(variable,"http_charset"))
  16 +                       http_charset=(char *)strdup(value);
  17
  18                 else if(!strcmp(variable,"broker_module")){
  19                         modptr=strtok(value," \n");
  20 --- nagios-3.0.3/base/nagios.c  2008-06-25 21:16:30.000000000 +0300
  21 +++ nagios-3.0.3-cgi/base/nagios.c      2008-10-11 12:34:44.464656939 +0300
  22 @@ -82,6 +82,7 @@
  23
  24  char            *illegal_object_chars=NULL;
  25  char            *illegal_output_chars=NULL;
  26 +char            *http_charset=NULL;
  27
  28  int             use_regexp_matches=FALSE;
  29  int             use_true_regexp_matching=FALSE;
  30 --- nagios-3.0.3/base/utils.c   2008-06-23 23:47:41.000000000 +0300
  31 +++ nagios-3.0.3-cgi/base/utils.c       2008-10-11 12:34:44.468657170 +0300
  32 @@ -87,6 +87,7 @@
  33
  34  extern char     *illegal_object_chars;
  35  extern char     *illegal_output_chars;
  36 +extern char     *http_charset;
  37
  38  extern int      use_regexp_matches;
  39  extern int      use_true_regexp_matching;
  40 @@ -4348,6 +4349,9 @@
  41         my_free(illegal_object_chars);
  42         my_free(illegal_output_chars);
  43
  44 +       /* free http charset variable */
  45 +       my_free(http_charset);
  46 +
  47         /* free nagios user and group */
  48         my_free(nagios_user);
  49         my_free(nagios_group);
  50 --- nagios-3.0.3/cgi/avail.c    2008-06-23 23:47:42.000000000 +0300
  51 +++ nagios-3.0.3-cgi/cgi/avail.c        2008-10-11 12:34:44.496658785 +0300
  52 @@ -37,6 +37,8 @@
  53  extern char url_images_path[MAX_FILENAME_LENGTH];
  54  extern char url_stylesheets_path[MAX_FILENAME_LENGTH];
  55
  56 +extern char *http_charset;
  57 +
  58  extern host      *host_list;
  59  extern hostgroup *hostgroup_list;
  60  extern servicegroup *servicegroup_list;
  61 @@ -1079,9 +1081,9 @@
  62         printf("Expires: %s\r\n",date_time);
  63
  64         if(output_format==HTML_OUTPUT)
  65 -               printf("Content-type: text/html\r\n\r\n");
  66 +               printf("Content-type: text/html; charset=\"%s\"\r\n\r\n", http_charset);
  67         else{
  68 -               printf("Content-type: text/plain\r\n\r\n");
  69 +               printf("Content-type: text/plain; charset=\"%s\"\r\n\r\n", http_charset);
  70                 return;
  71                 }
  72
  73 --- nagios-3.0.3/cgi/cgiutils.c 2008-06-23 23:47:44.000000000 +0300
  74 +++ nagios-3.0.3-cgi/cgi/cgiutils.c     2008-10-11 12:34:44.472657400 +0300
  75 @@ -55,6 +55,7 @@
  76  char            *statuswrl_include=NULL;
  77
  78  char            *illegal_output_chars=NULL;
  79 +char            *http_charset=NULL;
  80
  81  char            *notes_url_target=NULL;
  82  char            *action_url_target=NULL;
  83 @@ -188,6 +189,9 @@
  84         host_unreachable_sound=NULL;
  85         normal_sound=NULL;
  86
  87 +       my_free(http_charset);
  88 +       http_charset = strdup(DEFAULT_HTTP_CHARSET);
  89 +
  90         statusmap_background_image=NULL;
  91         statuswrl_include=NULL;
  92
  93 @@ -391,6 +395,9 @@
  94                 else if(!strcmp(var,"illegal_macro_output_chars"))
  95                         illegal_output_chars=strdup(val);
  96
  97 +               else if(!strcmp(var,"http_charset"))
  98 +                       http_charset=strdup(val);
  99 +
 100                 else if(!strcmp(var,"notes_url_target"))
 101                         notes_url_target=strdup(val);
 102
 103 --- nagios-3.0.3/cgi/cmd.c      2008-05-19 21:42:26.000000000 +0300
 104 +++ nagios-3.0.3-cgi/cgi/cmd.c  2008-10-11 12:34:44.496658785 +0300
 105 @@ -39,6 +39,8 @@
 106
 107  extern char url_stylesheets_path[MAX_FILENAME_LENGTH];
 108
 109 +extern char *http_charset;
 110 +
 111  extern int  nagios_process_state;
 112
 113  extern int  check_external_commands;
 114 @@ -235,7 +237,7 @@
 115
 116         if(content_type==WML_CONTENT){
 117
 118 -               printf("Content-type: text/vnd.wap.wml\r\n\r\n");
 119 +               printf("Content-type: text/vnd.wap.wml; charset=\"%s\"\r\n\r\n", http_charset);
 120
 121                 printf("<?xml version=\"1.0\"?>\n");
 122                 printf("<!DOCTYPE wml PUBLIC \"-//WAPFORUM//DTD WML 1.1//EN\" \"http://www.wapforum.org/DTD/wml_1.1.xml\">\n");
 123 @@ -247,7 +249,7 @@
 124
 125         else{
 126
 127 -               printf("Content-type: text/html\r\n\r\n");
 128 +               printf("Content-type: text/html; charset=\"%s\"\r\n\r\n", http_charset);
 129
 130                 printf("<html>\n");
 131                 printf("<head>\n");
 132 --- nagios-3.0.3/cgi/config.c   2008-04-13 21:34:27.000000000 +0300
 133 +++ nagios-3.0.3-cgi/cgi/config.c       2008-10-11 12:34:44.496658785 +0300
 134 @@ -37,6 +37,8 @@
 135  extern char   url_logo_images_path[MAX_FILENAME_LENGTH];
 136  extern char   url_stylesheets_path[MAX_FILENAME_LENGTH];
 137
 138 +extern char *http_charset;
 139 +
 140  extern host *host_list;
 141  extern service *service_list;
 142  extern hostgroup *hostgroup_list;
 143 @@ -293,7 +295,7 @@
 144         printf("Pragma: no-cache\r\n");
 145         printf("Last-Modified: %s\r\n",date_time);
 146         printf("Expires: %s\r\n",date_time);
 147 -       printf("Content-type: text/html\r\n\r\n");
 148 +       printf("Content-type: text/html; charset=\"%s\"\r\n\r\n", http_charset);
 149
 150         printf("<html>\n");
 151         printf("<head>\n");
 152 --- nagios-3.0.3/cgi/extinfo.c  2008-01-24 04:51:30.000000000 +0200
 153 +++ nagios-3.0.3-cgi/cgi/extinfo.c      2008-10-11 12:34:44.500659016 +0300
 154 @@ -38,6 +38,8 @@
 155  extern int              nagios_process_state;
 156  extern int              refresh_rate;
 157
 158 +extern char *http_charset;
 159 +
 160  extern time_t          program_start;
 161  extern int              nagios_pid;
 162  extern int              daemon_mode;
 163 @@ -584,7 +586,7 @@
 164         get_time_string(&expire_time,date_time,(int)sizeof(date_time),HTTP_DATE_TIME);
 165         printf("Expires: %s\r\n",date_time);
 166
 167 -       printf("Content-type: text/html\r\n\r\n");
 168 +       printf("Content-type: text/html; charset=\"%s\"\r\n\r\n", http_charset);
 169
 170         if(embedded==TRUE)
 171                 return;
 172 --- nagios-3.0.3/cgi/histogram.c        2008-05-19 21:42:26.000000000 +0300
 173 +++ nagios-3.0.3-cgi/cgi/histogram.c    2008-10-11 12:34:44.512659708 +0300
 174 @@ -130,6 +130,8 @@
 175  extern char url_stylesheets_path[MAX_FILENAME_LENGTH];
 176  extern char physical_images_path[MAX_FILENAME_LENGTH];
 177
 178 +extern char *http_charset;
 179 +
 180  extern int     log_rotation_method;
 181
 182  extern host *host_list;
 183 @@ -994,7 +996,7 @@
 184                 get_time_string(&expire_time,date_time,sizeof(date_time),HTTP_DATE_TIME);
 185                 printf("Expires: %s\r\n",date_time);
 186
 187 -               printf("Content-type: text/html\r\n\r\n");
 188 +               printf("Content-type: text/html; charset=\"%s\"\r\n\r\n", http_charset);
 189
 190                 if(embedded==TRUE)
 191                         return;
 192 --- nagios-3.0.3-cgi/cgi/history.c      2008-10-11 12:34:44.480657862 +0300
 193 +++ nagios-3.0.3/cgi/history.c  2008-10-11 12:38:12.164637148 +0300
 194 @@ -57,6 +57,8 @@
 195  extern char url_images_path[MAX_FILENAME_LENGTH];
 196  extern char url_stylesheets_path[MAX_FILENAME_LENGTH];
 197
 198 +extern char *http_charset;
 199 +
 200  extern int log_rotation_method;
 201
 202  extern int enable_splunk_integration;
 203 @@ -315,7 +317,7 @@
 204         get_time_string(&expire_time,date_time,sizeof(date_time),HTTP_DATE_TIME);
 205         printf("Expires: %s\r\n",date_time);
 206
 207 -       printf("Content-type: text/html\r\n\r\n");
 208 +       printf("Content-type: text/html; charset=\"%s\"\r\n\r\n", http_charset);
 209
 210         if(embedded==TRUE)
 211                 return;
 212 --- nagios-3.0.3/cgi/notifications.c    2008-05-19 21:42:27.000000000 +0300
 213 +++ nagios-3.0.3-cgi/cgi/notifications.c        2008-10-11 12:34:44.500659016 +0300
 214 @@ -37,6 +37,8 @@
 215  extern char url_docs_path[MAX_FILENAME_LENGTH];
 216  extern char url_stylesheets_path[MAX_FILENAME_LENGTH];
 217
 218 +extern char *http_charset;
 219 +
 220  extern int    log_rotation_method;
 221
 222
 223 @@ -303,7 +305,7 @@
 224         get_time_string(&expire_time,date_time,(int)sizeof(date_time),HTTP_DATE_TIME);
 225         printf("Expires: %s\r\n",date_time);
 226
 227 -       printf("Content-type: text/html\r\n\r\n");
 228 +       printf("Content-type: text/html; charset=\"%s\"\r\n\r\n", http_charset);
 229
 230         if(embedded==TRUE)
 231                 return;
 232 --- nagios-3.0.3/cgi/outages.c  2008-01-09 19:51:23.000000000 +0200
 233 +++ nagios-3.0.3-cgi/cgi/outages.c      2008-10-11 12:34:44.500659016 +0300
 234 @@ -39,6 +39,8 @@
 235  extern hoststatus *hoststatus_list;
 236  extern servicestatus *servicestatus_list;
 237
 238 +extern char *http_charset;
 239 +
 240  extern char main_config_file[MAX_FILENAME_LENGTH];
 241  extern char url_html_path[MAX_FILENAME_LENGTH];
 242  extern char url_stylesheets_path[MAX_FILENAME_LENGTH];
 243 @@ -215,7 +217,7 @@
 244         get_time_string(&expire_time,date_time,(int)sizeof(date_time),HTTP_DATE_TIME);
 245         printf("Expires: %s\r\n",date_time);
 246
 247 -       printf("Content-type: text/html\r\n\r\n");
 248 +       printf("Content-type: text/html; charset=\"%s\"\r\n\r\n", http_charset);
 249
 250         if(embedded==TRUE)
 251                 return;
 252 --- nagios-3.0.3/cgi/showlog.c  2008-01-09 19:51:23.000000000 +0200
 253 +++ nagios-3.0.3-cgi/cgi/showlog.c      2008-10-11 12:34:44.500659016 +0300
 254 @@ -37,6 +37,8 @@
 255  extern char   url_images_path[MAX_FILENAME_LENGTH];
 256  extern char   url_stylesheets_path[MAX_FILENAME_LENGTH];
 257
 258 +extern char *http_charset;
 259 +
 260  extern int    log_rotation_method;
 261
 262  extern int    enable_splunk_integration;
 263 @@ -188,7 +190,7 @@
 264         get_time_string(&expire_time,date_time,(int)sizeof(date_time),HTTP_DATE_TIME);
 265         printf("Expires: %s\r\n",date_time);
 266
 267 -       printf("Content-type: text/html\r\n\r\n");
 268 +       printf("Content-type: text/html; charset=\"%s\"\r\n\r\n", http_charset);
 269
 270         if(embedded==TRUE)
 271                 return;
 272 --- nagios-3.0.3/cgi/status.c   2008-06-23 23:47:46.000000000 +0300
 273 +++ nagios-3.0.3-cgi/cgi/status.c       2008-10-11 12:34:44.504659246 +0300
 274 @@ -44,6 +44,8 @@
 275  extern char url_media_path[MAX_FILENAME_LENGTH];
 276  extern char log_file[MAX_FILENAME_LENGTH];
 277
 278 +extern char *http_charset;
 279 +
 280  extern char *service_critical_sound;
 281  extern char *service_warning_sound;
 282  extern char *service_unknown_sound;
 283 @@ -503,7 +505,7 @@
 284         get_time_string(&expire_time,date_time,(int)sizeof(date_time),HTTP_DATE_TIME);
 285         printf("Expires: %s\r\n",date_time);
 286
 287 -       printf("Content-type: text/html\r\n\r\n");
 288 +       printf("Content-type: text/html; charset=\"%s\"\r\n\r\n", http_charset);
 289
 290         if(embedded==TRUE)
 291                 return;
 292 --- nagios-3.0.3/cgi/statusmap.c        2008-05-19 21:42:28.000000000 +0300
 293 +++ nagios-3.0.3-cgi/cgi/statusmap.c    2008-10-11 12:34:44.508659477 +0300
 294 @@ -54,6 +54,8 @@
 295  extern char url_logo_images_path[MAX_FILENAME_LENGTH];
 296  extern char url_stylesheets_path[MAX_FILENAME_LENGTH];
 297
 298 +extern char *http_charset;
 299 +
 300  extern host *host_list;
 301  extern hostgroup *hostgroup_list;
 302  extern service *service_list;
 303 @@ -320,7 +322,7 @@
 304                 get_time_string(&expire_time,date_time,sizeof(date_time),HTTP_DATE_TIME);
 305                 printf("Expires: %s\r\n",date_time);
 306
 307 -               printf("Content-Type: text/html\r\n\r\n");
 308 +               printf("Content-Type: text/html; charset=\"%s\"\r\n\r\n", http_charset);
 309
 310                 if(embedded==TRUE)
 311                         return;
 312 --- nagios-3.0.3/cgi/statuswml.c        2008-05-19 21:42:28.000000000 +0300
 313 +++ nagios-3.0.3-cgi/cgi/statuswml.c    2008-10-11 12:34:44.504659246 +0300
 314 @@ -40,6 +40,8 @@
 315  extern hoststatus *hoststatus_list;
 316  extern servicestatus *servicestatus_list;
 317
 318 +extern char *http_charset;
 319 +
 320  extern int      enable_notifications;
 321  extern int      execute_service_checks;
 322  extern int      nagios_process_state;
 323 @@ -193,7 +195,7 @@
 324         get_time_string(&expire_time,date_time,(int)sizeof(date_time),HTTP_DATE_TIME);
 325         printf("Expires: %s\r\n",date_time);
 326
 327 -       printf("Content-type: text/vnd.wap.wml\r\n\r\n");
 328 +       printf("Content-type: text/vnd.wap.wml; charset=\"%s\"\r\n\r\n", http_charset);
 329
 330         printf("<?xml version=\"1.0\"?>\n");
 331         printf("<!DOCTYPE wml PUBLIC \"-//WAPFORUM//DTD WML 1.1//EN\" \"http://www.wapforum.org/DTD/wml_1.1.xml\">\n");
 332 --- nagios-3.0.3/cgi/statuswrl.c        2007-07-16 19:41:46.000000000 +0300
 333 +++ nagios-3.0.3-cgi/cgi/statuswrl.c    2008-10-11 12:34:44.508659477 +0300
 334 @@ -41,6 +41,8 @@
 335  extern char url_images_path[MAX_FILENAME_LENGTH];
 336  extern char url_logo_images_path[MAX_FILENAME_LENGTH];
 337
 338 +extern char *http_charset;
 339 +
 340  extern char *statuswrl_include;
 341
 342  extern host *host_list;
 343 @@ -202,7 +204,7 @@
 344         get_time_string(&expire_time,date_time,sizeof(date_time),HTTP_DATE_TIME);
 345         printf("Expires: %s\r\n",date_time);
 346
 347 -       printf("Content-Type: x-world/x-vrml\r\n\r\n");
 348 +       printf("Content-Type: x-world/x-vrml; charset=\"%s\"\r\n\r\n", http_charset);
 349
 350         return;
 351          }
 352 --- nagios-3.0.3/cgi/summary.c  2008-01-24 04:51:30.000000000 +0200
 353 +++ nagios-3.0.3-cgi/cgi/summary.c      2008-10-11 12:34:44.504659246 +0300
 354 @@ -37,6 +37,8 @@
 355  extern char url_images_path[MAX_FILENAME_LENGTH];
 356  extern char url_stylesheets_path[MAX_FILENAME_LENGTH];
 357
 358 +extern char *http_charset;
 359 +
 360  extern host *host_list;
 361  extern hostgroup *hostgroup_list;
 362  extern service *service_list;
 363 @@ -698,9 +700,9 @@
 364         printf("Expires: %s\r\n",date_time);
 365
 366         if(output_format==HTML_OUTPUT)
 367 -               printf("Content-type: text/html\r\n\r\n");
 368 +               printf("Content-type: text/html; charset=\"%s\"\r\n\r\n", http_charset);
 369         else{
 370 -               printf("Content-type: text/plain\r\n\r\n");
 371 +               printf("Content-type: text/plain; charset=\"%s\"\r\n\r\n", http_charset);
 372                 return;
 373                 }
 374
 375 --- nagios-3.0.3/cgi/tac.c      2008-02-21 08:17:37.000000000 +0200
 376 +++ nagios-3.0.3-cgi/cgi/tac.c  2008-10-11 12:34:44.508659477 +0300
 377 @@ -52,6 +52,8 @@
 378  extern char   url_stylesheets_path[MAX_FILENAME_LENGTH];
 379  extern char   url_media_path[MAX_FILENAME_LENGTH];
 380
 381 +extern char *http_charset;
 382 +
 383  extern int    refresh_rate;
 384
 385  extern char *service_critical_sound;
 386 @@ -381,7 +383,7 @@
 387         get_time_string(&expire_time,date_time,(int)sizeof(date_time),HTTP_DATE_TIME);
 388         printf("Expires: %s\r\n",date_time);
 389
 390 -       printf("Content-type: text/html\r\n\r\n");
 391 +       printf("Content-type: text/html; charset=\"%s\"\r\n\r\n", http_charset);
 392
 393         if(embedded==TRUE)
 394                 return;
 395 --- nagios-3.0.3/cgi/trends.c   2008-06-23 23:47:46.000000000 +0300
 396 +++ nagios-3.0.3-cgi/cgi/trends.c       2008-10-11 12:34:44.512659708 +0300
 397 @@ -44,6 +44,8 @@
 398  extern char url_stylesheets_path[MAX_FILENAME_LENGTH];
 399  extern char physical_images_path[MAX_FILENAME_LENGTH];
 400
 401 +extern char *http_charset;
 402 +
 403  extern int     log_rotation_method;
 404
 405  extern host *host_list;
 406 @@ -1114,7 +1116,7 @@
 407                 get_time_string(&expire_time,date_time,sizeof(date_time),HTTP_DATE_TIME);
 408                 printf("Expires: %s\r\n",date_time);
 409
 410 -               printf("Content-type: text/html\r\n\r\n");
 411 +               printf("Content-type: text/html; charset=\"%s\"\r\n\r\n", http_charset);
 412
 413                 if(embedded==TRUE)
 414                         return;
 415 --- nagios-3.0.3/common/macros.c        2008-06-23 23:47:47.000000000 +0300
 416 +++ nagios-3.0.3-cgi/common/macros.c    2008-10-11 12:34:44.468657170 +0300
 417 @@ -40,6 +40,7 @@
 418  #endif
 419
 420  extern char     *illegal_output_chars;
 421 +extern char     *http_charset;
 422
 423  extern contact         *contact_list;
 424  extern contactgroup    *contactgroup_list;
 425 --- nagios-3.0.3/include/cgiutils.h.in  2007-11-11 01:34:26.000000000 +0200
 426 +++ nagios-3.0.3-cgi/include/cgiutils.h.in      2008-10-11 12:34:44.468657170 +0300
 427 @@ -422,6 +422,9 @@
 428  #define LIFO_ERROR_FILE                2
 429  #define LIFO_ERROR_DATA                3
 430
 431 +/************************** HTTP CHARSET ****************************/
 432 +
 433 +#define DEFAULT_HTTP_CHARSET "iso8859-1"
 434
 435
 436
 437 --- nagios-3.0.3/sample-config/cgi.cfg.in       2007-10-07 22:42:52.000000000 +0300
 438 +++ nagios-3.0.3-cgi/sample-config/cgi.cfg.in   2008-10-11 12:34:44.472657400 +0300
 439 @@ -36,6 +36,11 @@
 440  url_html_path=@htmurl@
 441
 442
 443 +# HTTP CHARSET
 444 +# This defines charset that is sent with HTTP headers.
 445 +
 446 +http_charset=iso8859-1
 447 +
 448
 449  # CONTEXT-SENSITIVE HELP
 450  # This option determines whether or not a context-sensitive