mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-04 20:46:11 +02:00
Code Issues Projects Releases Wiki Activity

BUILD: fix build on Solaris 10/11

Browse Source 
uint16_t instead of u_int16_t
None ISO fields of struct tm are not present, but
by zeroyfing it, on GNU and BSD systems tm_gmtoff
field will be set.

[wt: moved the memset into each of the date functions]
This commit is contained in:
David Carlier 2016-11-20 10:42:38 +00:00 committed by Willy Tarreau
parent 0034cd9e0a
commit 327298c215
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/types/connection.h
View File

@ -233,8 +233,8 @@ struct data_cb {
};
struct my_tcphdr {
u_int16_t source;
u_int16_t dest;
uint16_t source;
uint16_t dest;
};
/* a connection source profile defines all the parameters needed to properly

2
src/server.c
View File

@ -2742,7 +2742,7 @@ const char *update_server_addr_port(struct server *s, const char *addr, const ch
struct sockaddr_storage sa;
int ret, port_change_required;
char current_addr[INET6_ADDRSTRLEN];
u_int16_t current_port, new_port;
uint16_t current_port, new_port;
struct chunk *msg;
msg = get_trash_chunk();

12
src/standard.c
View File

@ -3077,6 +3077,9 @@ static inline int parse_http_time(const char **date, int *len, struct tm *tm)
*/
int parse_imf_date(const char *date, int len, struct tm *tm)
{
/* tm_gmtoff, if present, ought to be zero'ed */
memset(tm, 0, sizeof(*tm));
RET0_UNLESS(parse_http_dayname(&date, &len, tm)); /* day-name */
RET0_UNLESS(parse_expect_char(&date, &len, ',')); /* expect "," */
RET0_UNLESS(parse_expect_char(&date, &len, ' ')); /* expect SP */
@ -3091,7 +3094,6 @@ int parse_imf_date(const char *date, int len, struct tm *tm)
RET0_UNLESS(parse_expect_char(&date, &len, ' ')); /* expect SP */
RET0_UNLESS(parse_strcmp(&date, &len, "GMT", 3)); /* GMT = %x47.4D.54 ; "GMT", case-sensitive */
tm->tm_isdst = -1;
tm->tm_gmtoff = 0;
return 1;
}
@ -3108,6 +3110,9 @@ int parse_rfc850_date(const char *date, int len, struct tm *tm)
{
int year;
/* tm_gmtoff, if present, ought to be zero'ed */
memset(tm, 0, sizeof(*tm));
RET0_UNLESS(parse_http_ldayname(&date, &len, tm)); /* Read the day name */
RET0_UNLESS(parse_expect_char(&date, &len, ',')); /* expect "," */
RET0_UNLESS(parse_expect_char(&date, &len, ' ')); /* expect SP */
@ -3145,7 +3150,6 @@ int parse_rfc850_date(const char *date, int len, struct tm *tm)
RET0_UNLESS(parse_expect_char(&date, &len, ' ')); /* expect SP */
RET0_UNLESS(parse_strcmp(&date, &len, "GMT", 3)); /* GMT = %x47.4D.54 ; "GMT", case-sensitive */
tm->tm_isdst = -1;
tm->tm_gmtoff = 0;
return 1;
}
@ -3163,6 +3167,9 @@ int parse_rfc850_date(const char *date, int len, struct tm *tm)
*/
int parse_asctime_date(const char *date, int len, struct tm *tm)
{
/* tm_gmtoff, if present, ought to be zero'ed */
memset(tm, 0, sizeof(*tm));
RET0_UNLESS(parse_http_dayname(&date, &len, tm)); /* day-name */
RET0_UNLESS(parse_expect_char(&date, &len, ' ')); /* expect SP */
RET0_UNLESS(parse_http_monthname(&date, &len, tm)); /* expect month */
@ -3180,7 +3187,6 @@ int parse_asctime_date(const char *date, int len, struct tm *tm)
RET0_UNLESS(parse_4digit(&date, &len, &tm->tm_year)); /* year = 4DIGIT */
tm->tm_year -= 1900;
tm->tm_isdst = -1;
tm->tm_gmtoff = 0;
return 1;
}