RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* released 1.2.5.2 

* fixed build on PPC where chars are unsigned by default
This commit is contained in:
willy tarreau 2005-12-18 01:15:23 +01:00
parent 08dedbe898
commit 5dffb607d6
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -1,6 +1,9 @@
ChangeLog : ChangeLog :
=========== ===========
2005/06/21 : 1.2.5.2
- fixed build on PPC where chars are unsigned by default
2005/05/02 : 1.2.5.1 2005/05/02 : 1.2.5.1
- dirty hack to fix a bug introduced with epoll : if we close an FD and - dirty hack to fix a bug introduced with epoll : if we close an FD and
immediately reassign it to another session through a connect(), the immediately reassign it to another session through a connect(), the

26
haproxy.c
View File

@ -76,8 +76,8 @@
#include "include/appsession.h" #include "include/appsession.h"
#define HAPROXY_VERSION "1.2.5" #define HAPROXY_VERSION "1.2.5.2"
#define HAPROXY_DATE "2005/04/30" #define HAPROXY_DATE "2005/06/21"
/* this is for libc5 for example */ /* this is for libc5 for example */
#ifndef TCP_NODELAY #ifndef TCP_NODELAY
@ -553,7 +553,7 @@ struct proxy {
struct sockaddr_in source_addr; /* the address to which we want to bind for connect() */ struct sockaddr_in source_addr; /* the address to which we want to bind for connect() */
struct proxy *next; struct proxy *next;
struct sockaddr_in logsrv1, logsrv2; /* 2 syslog servers */ struct sockaddr_in logsrv1, logsrv2; /* 2 syslog servers */
char logfac1, logfac2; /* log facility for both servers. -1 = disabled */ signed char logfac1, logfac2; /* log facility for both servers. -1 = disabled */
int loglev1, loglev2; /* log level for each server, 7 by default */ int loglev1, loglev2; /* log level for each server, 7 by default */
int to_log; /* things to be logged (LW_*) */ int to_log; /* things to be logged (LW_*) */
struct timeval stop_time; /* date to stop listening, when stopping != 0 */ struct timeval stop_time; /* date to stop listening, when stopping != 0 */
@ -1808,7 +1808,12 @@ int event_cli_read(int fd) {
#endif #endif
if (fdtab[fd].state != FD_STERROR) { if (fdtab[fd].state != FD_STERROR) {
while (1) { #ifdef FILL_BUFFERS
while (1)
#else
do
#endif
{
if (b->l == 0) { /* let's realign the buffer to optimize I/O */ if (b->l == 0) { /* let's realign the buffer to optimize I/O */
b->r = b->w = b->h = b->lr = b->data; b->r = b->w = b->h = b->lr = b->data;
max = b->rlim - b->data; max = b->rlim - b->data;
@ -1871,6 +1876,9 @@ int event_cli_read(int fd) {
break; break;
} }
} /* while(1) */ } /* while(1) */
#ifndef FILL_BUFFERS
while (0);
#endif
} }
else { else {
s->res_cr = RES_ERROR; s->res_cr = RES_ERROR;
@ -1905,7 +1913,12 @@ int event_srv_read(int fd) {
#endif #endif
if (fdtab[fd].state != FD_STERROR) { if (fdtab[fd].state != FD_STERROR) {
while (1) { #ifdef FILL_BUFFERS
while (1)
#else
do
#endif
{
if (b->l == 0) { /* let's realign the buffer to optimize I/O */ if (b->l == 0) { /* let's realign the buffer to optimize I/O */
b->r = b->w = b->h = b->lr = b->data; b->r = b->w = b->h = b->lr = b->data;
max = b->rlim - b->data; max = b->rlim - b->data;
@ -1968,6 +1981,9 @@ int event_srv_read(int fd) {
break; break;
} }
} /* while(1) */ } /* while(1) */
#ifndef FILL_BUFFERS
while (0);
#endif
} }
else { else {
s->res_sr = RES_ERROR; s->res_sr = RES_ERROR;