mirror of
http://git.haproxy.org/git/haproxy.git/
synced 2025-01-19 04:00:46 +00:00
8317b283fb
Released version 1.5-dev23 with the following main changes : - BUG/MINOR: reject malformed HTTP/0.9 requests - MINOR: systemd wrapper: re-execute on SIGUSR2 - MINOR: systemd wrapper: improve logging - MINOR: systemd wrapper: propagate exit status - BUG/MINOR: tcpcheck connect wrong behavior - MEDIUM: proxy: support use_backend with dynamic names - MINOR: stats: Enhancement to stats page to provide information of last session time. - BUG/MEDIUM: peers: fix key consistency for integer stick tables - DOC: fix a typo on http-server-close and encapsulate options with double-quotes - DOC: fix fetching samples syntax - MINOR: ssl: add ssl_fc_unique_id to fetch TLS Unique ID - MEDIUM: ssl: Use ALPN support as it will be available in OpenSSL 1.0.2 - DOC: fix typo - CLEANUP: code style: use tabs to indent codes instead of spaces - DOC: fix a few config typos. - BUG/MINOR: raw_sock: also consider ENOTCONN in addition to EAGAIN for recv() - DOC: lowercase format string in unique-id - MINOR: set IP_FREEBIND on IPv6 sockets in transparent mode - BUG/MINOR: acl: req_ssl_sni fails with SSLv3 record version - BUG/MINOR: build: add missing objects in osx and bsd Makefiles - BUG/MINOR: build: handle whitespaces in wc -l output - BUG/MINOR: Fix name lookup ordering when compiled with USE_GETADDRINFO - MEDIUM: ssl: Add standardized DH parameters >= 1024 bits - BUG/MEDIUM: map: The map parser includes blank lines. - BUG/MINOR: log: The log of quotted capture header has been terminated by 2 quotes. - MINOR: standard: add function "encode_chunk" - BUG/MINOR: http: fix encoding of samples used in http headers - MINOR: sample: add hex converter - MEDIUM: sample: change the behavior of the bin2str cast - MAJOR: auth: Change the internal authentication system. - MEDIUM: acl/pattern: standardisation "of pat_parse_int()" and "pat_parse_dotted_ver()" - MEDIUM: pattern: The pattern parser no more uses <opaque> and just takes one string. - MEDIUM: pattern: Change the prototype of the function pattern_register(). - CONTRIB: ip6range: add a network IPv6 range to mask converter - MINOR: pattern: separe list element from the data part. - MEDIUM: pattern: add indexation function. - MEDIUM: pattern: The parse functions just return "struct pattern" without memory allocation - MINOR: pattern: Rename "pat_idx_elt" to "pattern_tree" - MINOR: sample: dont call the sample cast function "c_none" - MINOR: standard: Add function for converting cidr to network mask. - MEDIUM: sample: Remove types SMP_T_CSTR and SMP_T_CBIN, replace it by SMP_F_CONST flags - MEDIUM: sample/http_proto: Add new type called method - MINOR: dumpstats: Group map inline help - MEDIUM: pattern: The function pattern_exec_match() returns "struct pattern" if the patten match. - MINOR: dumpstats: change map inline sentences - MINOR: dumpstats: change the "get map" display management - MINOR: map/dumpstats: The cli cmd "get map ..." display the "int" format. - MEDIUM: pattern: The match function browse itself the list or the tree. - MEDIUM: pattern: Index IPv6 addresses in a tree. - MEDIUM: pattern: add delete functions - MEDIUM: pattern: add prune function - MEDIUM: pattern: add sample lookup function. - MEDIUM: pattern/dumpstats: The function pattern_lookup() is no longer used - MINOR: map/pattern: The sample parser is stored in the pattern - MAJOR: pattern/map: Extends the map edition system in the patterns - MEDIUM: pattern: merge same pattern - MEDIUM: pattern: The expected type is stored in the pattern head, and conversion is executed once. - MINOR: pattern: Each pattern is identified by unique id. - MINOR: pattern/acl: Each pattern of each acl can be load with specified id - MINOR: pattern: The function "pattern_register()" is no longer used. - MINOR: pattern: Merge function pattern_add() with pat_ref_push(). - MINOR: pattern: store configuration reference for each acl or map pattern. - MINOR: pattern: Each pattern expression element store the reference struct. - MINOR: dumpstats: display the reference for th key/pattern and value. - MEDIUM: pattern: delete() function uses the pat_ref_elt to find the element to be removed - MEDIUM: pattern_find_smp: functions find_smp uses the pat_ref_elt to find the element to be removed - MEDIUM: dumpstats/pattern: display and use each pointer of each pattern dumped - MINOR: pattern/map/acl: Centralization of the file parsers - MINOR: pattern: Check if the file reference is not used with acl and map - MINOR: acl/pattern: Acl "-M" option force to load file as map file with two columns - MEDIUM: dumpstats: Display error message during add of values. - MINOR: pattern: The function pat_ref_set() have now atomic behavior - MINOR: regex: The pointer regstr in the struc regex is no longer used. - MINOR: cli: Block the usage of the command "acl add" in many cases. - MINOR: doc: Update the documentation about the map and acl - MINOR: pattern: index duplicates - MINOR: configuration: File and line propagation - MINOR: dumpstat/conf: display all the configuration lines that using pattern reference - MINOR: standard: Disable ip resolution during the runtime - MINOR: pattern: Remove the flag "PAT_F_FROM_FILE". - MINOR: pattern: forbid dns resolutions - DOC: document "get map" / "get acl" on the CLI - MEDIUM: acl: Change the acl register struct - BUG/MEDIUM: acl: boolean only matches were broken by recent changes - DOC: pattern: pattern organisation schematics - MINOR: pattern/cli: Update used terms in documentation and cli - MINOR: cli: remove information about acl or map owner. - MINOR: session: don't always assume there's a listener - MINOR: pattern: Add function to prune and reload pattern list. - MINOR: standard: Add ipv6 support in the function url2sa(). - MEDIUM: config: Dynamic sections. - BUG/MEDIUM: stick-table: fix IPv4-to-IPv6 conversion in src_* fetches - MINOR: http: Add the "language" converter to for use with accept-language - BUG/MINOR: log: Don't dump empty unique-id - BUG/MAJOR: session: fix a possible crash with src_tracked - DOC: Update "language" documentation - MINOR: http: add the function "del-header" to the directives http-request and http-response - DOC: add some information on capture.(req|res).hdr - MINOR: http: capture.req.method and capture.req.uri - MINOR: http: optimize capture.req.method and capture.req.uri - MINOR: session: clean up the connection free code - BUG/MEDIUM: checks: immediately report a connection success - MEDIUM: connection: don't use real send() flags in snd_buf() - OPTIM: ssl: implement dynamic record size adjustment - MINOR: stats: report exact last session time in backend too - BUG/MEDIUM: stats: the "lastsess" field must appear last in the CSV. - BUG/MAJOR: check: fix memory leak in "tcp-check connect" over SSL - BUG/MINOR: channel: initialize xfer_small/xfer_large on new buffers - MINOR: channel: add the date of last read in the channel - MEDIUM: stream-int: automatically disable CF_STREAMER flags after idle - MINOR: ssl: add DEFAULT_SSL_MAX_RECORD to set the record size at build time - MINOR: config: make the stream interface idle timer user-configurable - MINOR: config: add global directives to set default SSL ciphers - MINOR: sample: add a rand() sample fetch to return a sample. - BUG/MEDIUM: config: immediately abort if peers section has no name - BUG/MINOR: ssl: fix syntax in config error message - BUG/MEDIUM: ssl: always send a full buffer after EAGAIN - BUG/MINOR: config: server on-marked-* statement is ignored in default-server - BUG/MEDIUM: backend: prefer-last-server breaks redispatch - BUG/MEDIUM: http: continue to emit 503 on keep-alive to different server - MEDIUM: acl: fix pattern type for payload / payload_lv - BUG/MINOR: config: fix a crash on startup when a disabled backend references a peer - BUG/MEDIUM: compression: fix the output type of the compressor name - BUG/MEDIUM: http: don't start to forward request data before the connect - MINOR: http: release compression context only in http_end_txn() - MINOR: protect ebimtree/ebistree against multiple inclusions - MEDIUM: proxy: create a tree to store proxies by name - MEDIUM: proxy: make findproxy() use trees to look up proxies - MEDIUM: proxy: make get_backend_server() use findproxy() to lookup proxies - MEDIUM: stick-table: lookup table names using trees. - MEDIUM: config: faster lookup for duplicated proxy name - CLEANUP: acl: remove obsolete test in parse_acl_expr() - MINOR: sample: move smp_to_type to sample.c - MEDIUM: compression: consider the "q=" attribute in Accept-Encoding - REORG: cfgparse: move server keyword parsing to server.c - BUILD: adjust makefile for AIX 5.1 - BUG/MEDIUM: pattern: fix wrong definition of the pat_prune_fcts array - CLEANUP: pattern: move array definitions to proto/ and not types/ - BUG/MAJOR: counters: check for null-deref when looking up an alternate table - BUILD: ssl: previous patch failed - BUILD/MEDIUM: standard: get rid of the last strcpy() - BUILD/MEDIUM: standard: get rid of sprintf() - BUILD/MEDIUM: cfgparse: get rid of sprintf() - BUILD/MEDIUM: checks: get rid of sprintf() - BUILD/MEDIUM: http: remove calls to sprintf() - BUG/MEDIUM: systemd-wrapper: fix locating of haproxy binary - BUILD/MINOR: ssl: remove one call to sprintf() - MEDIUM: http: don't reject anymore message bodies not containing the url param - MEDIUM: http: wait for the first chunk or message body length in http_process_body - CLEANUP: http: rename http_process_request_body() - CLEANUP: http: prepare dedicated processing for chunked encoded message bodies - MINOR: http: make msg->eol carry the last CRLF length - MAJOR: http: do not use msg->sol while processing messages or forwarding data - MEDIUM: http: http_parse_chunk_crlf() must not advance the buffer pointer - MAJOR: http: don't update msg->sov anymore while processing the body - MINOR: http: add a small helper to compute the amount of body bytes present - MEDIUM: http: add a small helper to compute how far to rewind to find headers - MINOR: http: add a small helper to compute how far to rewind to find URI - MEDIUM: http: small helpers to compute how far to rewind to find BODY and DATA - MAJOR: http: reset msg->sov after headers are forwarded - MEDIUM: http: forward headers again while waiting for connection to complete - BUG/MINOR: http: deinitialize compression after a parsing error - BUG/MINOR: http: deinitialize compression after a compression error - MEDIUM: http: headers must be forwarded even if data was already inspected - MAJOR: http: re-enable compression on chunked encoding - MAJOR: http/compression: fix chunked-encoded response processing - MEDIUM: http: cleanup: centralize a little bit HTTP compression end - MEDIUM: http: start to centralize the forwarding code - MINOR: http: further cleanups of response forwarding function - MEDIUM: http: only allocate the temporary compression buffer when needed - MAJOR: http: centralize data forwarding in the request path - CLEANUP: http: document the response forwarding states - CLEANUP: http: remove all calls to http_silent_debug() - DOC: internal: add some reminders about HTTP parsing and pointer states - BUG/MAJOR: http: fix bug in parse_qvalue() when selecting compression algo - BUG/MINOR: stats: last session was not always set - DOC: add pointer to the Cyril's HTML doc in the README - MEDIUM: config: relax use_backend check to make the condition optional - MEDIUM: config: report misplaced http-request rules - MEDIUM: config: report misplaced use-server rules - DOC: update roadmap with what was done.
512 lines
24 KiB
Plaintext
512 lines
24 KiB
Plaintext
----------------------
|
||
HAProxy how-to
|
||
----------------------
|
||
version 1.5-dev23
|
||
willy tarreau
|
||
2014/04/23
|
||
|
||
|
||
1) How to build it
|
||
------------------
|
||
|
||
To build haproxy, you will need :
|
||
- GNU make. Neither Solaris nor OpenBSD's make work with the GNU Makefile.
|
||
However, specific Makefiles for BSD and OSX are provided.
|
||
- GCC between 2.91 and 4.7. Others may work, but not tested.
|
||
- GNU ld
|
||
|
||
Also, you might want to build with libpcre support, which will provide a very
|
||
efficient regex implementation and will also fix some badness on Solaris' one.
|
||
|
||
To build haproxy, you have to choose your target OS amongst the following ones
|
||
and assign it to the TARGET variable :
|
||
|
||
- linux22 for Linux 2.2
|
||
- linux24 for Linux 2.4 and above (default)
|
||
- linux24e for Linux 2.4 with support for a working epoll (> 0.21)
|
||
- linux26 for Linux 2.6 and above
|
||
- linux2628 for Linux 2.6.28 and above (enables splice and tproxy)
|
||
- solaris for Solaris 8 or 10 (others untested)
|
||
- freebsd for FreeBSD 5 to 8.0 (others untested)
|
||
- osx for Mac OS/X
|
||
- openbsd for OpenBSD 3.1 to 5.2 (others untested)
|
||
- aix51 for AIX 5.1
|
||
- aix52 for AIX 5.2
|
||
- cygwin for Cygwin
|
||
- generic for any other OS.
|
||
- custom to manually adjust every setting
|
||
|
||
You may also choose your CPU to benefit from some optimizations. This is
|
||
particularly important on UltraSparc machines. For this, you can assign
|
||
one of the following choices to the CPU variable :
|
||
|
||
- i686 for intel PentiumPro, Pentium 2 and above, AMD Athlon
|
||
- i586 for intel Pentium, AMD K6, VIA C3.
|
||
- ultrasparc : Sun UltraSparc I/II/III/IV processor
|
||
- native : use the build machine's specific processor optimizations
|
||
- generic : any other processor or no specific optimization. (default)
|
||
|
||
Alternatively, you may just set the CPU_CFLAGS value to the optimal GCC options
|
||
for your platform.
|
||
|
||
You may want to build specific target binaries which do not match your native
|
||
compiler's target. This is particularly true on 64-bit systems when you want
|
||
to build a 32-bit binary. Use the ARCH variable for this purpose. Right now
|
||
it only knows about a few x86 variants (i386,i486,i586,i686,x86_64), two
|
||
generic ones (32,64) and sets -m32/-m64 as well as -march=<arch> accordingly.
|
||
|
||
If your system supports PCRE (Perl Compatible Regular Expressions), then you
|
||
really should build with libpcre which is between 2 and 10 times faster than
|
||
other libc implementations. Regex are used for header processing (deletion,
|
||
rewriting, allow, deny). The only inconvenient of libpcre is that it is not
|
||
yet widely spread, so if you build for other systems, you might get into
|
||
trouble if they don't have the dynamic library. In this situation, you should
|
||
statically link libpcre into haproxy so that it will not be necessary to
|
||
install it on target systems. Available build options for PCRE are :
|
||
|
||
- USE_PCRE=1 to use libpcre, in whatever form is available on your system
|
||
(shared or static)
|
||
|
||
- USE_STATIC_PCRE=1 to use a static version of libpcre even if the dynamic
|
||
one is available. This will enhance portability.
|
||
|
||
- with no option, use your OS libc's standard regex implementation (default).
|
||
Warning! group references on Solaris seem broken. Use static-pcre whenever
|
||
possible.
|
||
|
||
Recent systems can resolve IPv6 host names using getaddrinfo(). This primitive
|
||
is not present in all libcs and does not work in all of them either. Support in
|
||
glibc was broken before 2.3. Some embedded libs may not properly work either,
|
||
thus, support is disabled by default, meaning that some host names which only
|
||
resolve as IPv6 addresses will not resolve and configs might emit an error
|
||
during parsing. If you know that your OS libc has reliable support for
|
||
getaddrinfo(), you can add USE_GETADDRINFO=1 on the make command line to enable
|
||
it. This is the recommended option for most Linux distro packagers since it's
|
||
working fine on all recent mainstream distros. It is automatically enabled on
|
||
Solaris 8 and above, as it's known to work.
|
||
|
||
It is possible to add native support for SSL using the GNU makefile only, and
|
||
by passing "USE_OPENSSL=1" on the make commande line. The libssl and libcrypto
|
||
will automatically be linked with haproxy. Some systems also require libz, so
|
||
if the build fails due to missing symbols such as deflateInit(), then try again
|
||
with "ADDLIB=-lz".
|
||
|
||
To link OpenSSL statically against haproxy, build OpenSSL with the no-shared
|
||
keyword and install it to a local directory, so your system is not affected :
|
||
|
||
$ export STATICLIBSSL=/tmp/staticlibssl
|
||
$ ./config --prefix=$STATICLIBSSL no-shared
|
||
$ make && make install_sw
|
||
|
||
When building haproxy, pass that path via SSL_INC and SSL_LIB to make and
|
||
include additional libs with ADDLIB if needed (in this case for example libdl):
|
||
$ make TARGET=linux26 USE_OPENSSL=1 SSL_INC=$STATICLIBSSL/include SSL_LIB=$STATICLIBSSL/lib ADDLIB=-ldl
|
||
|
||
It is also possible to include native support for ZLIB to benefit from HTTP
|
||
compression. For this, pass "USE_ZLIB=1" on the "make" command line and ensure
|
||
that zlib is present on the system.
|
||
|
||
By default, the DEBUG variable is set to '-g' to enable debug symbols. It is
|
||
not wise to disable it on uncommon systems, because it's often the only way to
|
||
get a complete core when you need one. Otherwise, you can set DEBUG to '-s' to
|
||
strip the binary.
|
||
|
||
For example, I use this to build for Solaris 8 :
|
||
|
||
$ make TARGET=solaris CPU=ultrasparc USE_STATIC_PCRE=1
|
||
|
||
And I build it this way on OpenBSD or FreeBSD :
|
||
|
||
$ make -f Makefile.bsd REGEX=pcre DEBUG= COPTS.generic="-Os -fomit-frame-pointer -mgnu"
|
||
|
||
And on a classic Linux with SSL and ZLIB support (eg: Red Hat 5.x) :
|
||
|
||
$ make TARGET=linux26 CPU=native USE_PCRE=1 USE_OPENSSL=1 USE_ZLIB=1
|
||
|
||
And on a recent Linux >= 2.6.28 with SSL and ZLIB support :
|
||
|
||
$ make TARGET=linux2628 CPU=native USE_PCRE=1 USE_OPENSSL=1 USE_ZLIB=1
|
||
|
||
In order to build a 32-bit binary on an x86_64 Linux system with SSL support
|
||
without support for compression but when OpenSSL requires ZLIB anyway :
|
||
|
||
$ make TARGET=linux26 ARCH=i386 USE_OPENSSL=1 ADDLIB=-lz
|
||
|
||
The BSD and OSX makefiles do not support build options for OpenSSL nor zlib.
|
||
Also, at least on OpenBSD, pthread_mutexattr_setpshared() does not exist so
|
||
the SSL session cache cannot be shared between multiple processes. If you want
|
||
to enable these options, you need to use GNU make with the default makefile as
|
||
follows :
|
||
|
||
$ gmake TARGET=openbsd USE_OPENSSL=1 USE_ZLIB=1 USE_PRIVATE_CACHE=1
|
||
|
||
If you need to pass other defines, includes, libraries, etc... then please
|
||
check the Makefile to see which ones will be available in your case, and
|
||
use the USE_* variables in the GNU Makefile, or ADDINC, ADDLIB, and DEFINE
|
||
variables in the BSD makefiles.
|
||
|
||
AIX 5.3 is known to work with the generic target. However, for the binary to
|
||
also run on 5.2 or earlier, you need to build with DEFINE="-D_MSGQSUPPORT",
|
||
otherwise __fd_select() will be used while not being present in the libc.
|
||
If you get build errors because of strange symbols or section mismatches,
|
||
simply remove -g from DEBUG_CFLAGS.
|
||
|
||
You can easily define your own target with the GNU Makefile. Unknown targets
|
||
are processed with no default option except USE_POLL=default. So you can very
|
||
well use that property to define your own set of options. USE_POLL can even be
|
||
disabled by setting USE_POLL="". For example :
|
||
|
||
$ gmake TARGET=tiny USE_POLL="" TARGET_CFLAGS=-fomit-frame-pointer
|
||
|
||
|
||
2) How to install it
|
||
--------------------
|
||
|
||
To install haproxy, you can either copy the single resulting binary to the
|
||
place you want, or run :
|
||
|
||
$ sudo make install
|
||
|
||
If you're packaging it for another system, you can specify its root directory
|
||
in the usual DESTDIR variable.
|
||
|
||
|
||
3) How to set it up
|
||
-------------------
|
||
|
||
There is some documentation in the doc/ directory :
|
||
|
||
- architecture.txt : this is the architecture manual. It is quite old and
|
||
does not tell about the nice new features, but it's still a good starting
|
||
point when you know what you want but don't know how to do it.
|
||
|
||
- configuration.txt : this is the configuration manual. It recalls a few
|
||
essential HTTP basic concepts, and details all the configuration file
|
||
syntax (keywords, units). It also describes the log and stats format. It
|
||
is normally always up to date. If you see that something is missing from
|
||
it, please report it as this is a bug. Please note that this file is
|
||
huge and that it's generally more convenient to review Cyril Bont<6E>'s
|
||
HTML translation online here :
|
||
|
||
http://cbonte.github.io/haproxy-dconv/configuration-1.5.html
|
||
|
||
- haproxy-en.txt / haproxy-fr.txt : these are the old outdated docs. You
|
||
should never need them. If you do, then please report what you didn't
|
||
find in the other ones.
|
||
|
||
- gpl.txt / lgpl.txt : the copy of the licenses covering the software. See
|
||
the 'LICENSE' file at the top for more information.
|
||
|
||
- the rest is mainly for developers.
|
||
|
||
There are also a number of nice configuration examples in the "examples"
|
||
directory as well as on several sites and articles on the net which are linked
|
||
to from the haproxy web site.
|
||
|
||
|
||
4) How to report a bug
|
||
----------------------
|
||
|
||
It is possible that from time to time you'll find a bug. A bug is a case where
|
||
what you see is not what is documented. Otherwise it can be a misdesign. If you
|
||
find that something is stupidly design, please discuss it on the list (see the
|
||
"how to contribute" section below). If you feel like you're proceeding right
|
||
and haproxy doesn't obey, then first ask yourself if it is possible that nobody
|
||
before you has even encountered this issue. If it's unlikely, the you probably
|
||
have an issue in your setup. Just in case of doubt, please consult the mailing
|
||
list archives :
|
||
|
||
http://marc.info/?l=haproxy
|
||
|
||
Otherwise, please try to gather the maximum amount of information to help
|
||
reproduce the issue and send that to the mailing list :
|
||
|
||
haproxy@formilux.org
|
||
|
||
Please include your configuration and logs. You can mask your IP addresses and
|
||
passwords, we don't need them. But it's essential that you post your config if
|
||
you want people to guess what is happening.
|
||
|
||
Also, keep in mind that haproxy is designed to NEVER CRASH. If you see it die
|
||
without any reason, then it definitely is a critical bug that must be reported
|
||
and urgently fixed. It has happened a couple of times in the past, essentially
|
||
on development versions running on new architectures. If you think your setup
|
||
is fairly common, then it is possible that the issue is totally unrelated.
|
||
Anyway, if that happens, feel free to contact me directly, as I will give you
|
||
instructions on how to collect a usable core file, and will probably ask for
|
||
other captures that you'll not want to share with the list.
|
||
|
||
|
||
5) How to contribute
|
||
--------------------
|
||
|
||
It is possible that you'll want to add a specific feature to satisfy your needs
|
||
or one of your customers'. Contributions are welcome, however I'm often very
|
||
picky about changes. I will generally reject patches that change massive parts
|
||
of the code, or that touch the core parts without any good reason if those
|
||
changes have not been discussed first.
|
||
|
||
The proper place to discuss your changes is the HAProxy Mailing List. There are
|
||
enough skilled readers to catch hazardous mistakes and to suggest improvements.
|
||
I trust a number of them enough to merge a patch if they say it's OK, so using
|
||
the list is the fastest way to get your code reviewed and merged. You can
|
||
subscribe to it by sending an empty e-mail at the following address :
|
||
|
||
haproxy+subscribe@formilux.org
|
||
|
||
If you have an idea about something to implement, *please* discuss it on the
|
||
list first. It has already happened several times that two persons did the same
|
||
thing simultaneously. This is a waste of time for both of them. It's also very
|
||
common to see some changes rejected because they're done in a way that will
|
||
conflict with future evolutions, or that does not leave a good feeling. It's
|
||
always unpleasant for the person who did the work, and it is unpleasant for me
|
||
too because I value people's time and efforts. That would not happen if these
|
||
were discussed first. There is no problem posting work in progress to the list,
|
||
it happens quite often in fact. Also, don't waste your time with the doc when
|
||
submitting patches for review, only add the doc with the patch you consider
|
||
ready to merge.
|
||
|
||
Another important point concerns code portability. Haproxy requires gcc as the
|
||
C compiler, and may or may not work with other compilers. However it's known
|
||
to build using gcc 2.95 or any later version. As such, it is important to keep
|
||
in mind that certain facilities offered by recent versions must not be used in
|
||
the code :
|
||
|
||
- declarations mixed in the code (requires gcc >= 3.x)
|
||
- GCC builtins without checking for their availability based on version and
|
||
architecture ;
|
||
- assembly code without any alternate portable form for other platforms
|
||
- use of stdbool.h, "bool", "false", "true" : simply use "int", "0", "1"
|
||
- in general, anything which requires C99 (such as declaring variables in
|
||
"for" statements)
|
||
|
||
Since most of these restrictions are just a matter of coding style, it is
|
||
normally not a problem to comply.
|
||
|
||
If your work is very confidential and you can't publicly discuss it, you can
|
||
also mail me directly about it, but your mail may be waiting several days in
|
||
the queue before you get a response.
|
||
|
||
If you'd like a feature to be added but you think you don't have the skills to
|
||
implement it yourself, you should follow these steps :
|
||
|
||
1. discuss the feature on the mailing list. It is possible that someone
|
||
else has already implemented it, or that someone will tell you how to
|
||
proceed without it, or even why not to do it. It is also possible that
|
||
in fact it's quite easy to implement and people will guide you through
|
||
the process. That way you'll finally have YOUR patch merged, providing
|
||
the feature YOU need.
|
||
|
||
2. if you really can't code it yourself after discussing it, then you may
|
||
consider contacting someone to do the job for you. Some people on the
|
||
list might be OK with trying to do it. Otherwise, you can check the list
|
||
of contributors at the URL below, some of the regular contributors may
|
||
be able to do the work, probably not for free but their time is as much
|
||
valuable as yours after all, you can't eat the cake and have it too.
|
||
|
||
The list of past and regular contributors is available below. It lists not only
|
||
significant code contributions (features, fixes), but also time or money
|
||
donations :
|
||
|
||
http://haproxy.1wt.eu/contrib.html
|
||
|
||
Note to contributors: it's very handy when patches comes with a properly
|
||
formated subject. There are 3 criteria of particular importance in any patch :
|
||
|
||
- its nature (is it a fix for a bug, a new feature, an optimization, ...)
|
||
- its importance, which generally reflects the risk of merging/not merging it
|
||
- what area it applies to (eg: http, stats, startup, config, doc, ...)
|
||
|
||
It's important to make these 3 criteria easy to spot in the patch's subject,
|
||
because it's the first (and sometimes the only) thing which is read when
|
||
reviewing patches to find which ones need to be backported to older versions.
|
||
|
||
Specifically, bugs must be clearly easy to spot so that they're never missed.
|
||
Any patch fixing a bug must have the "BUG" tag in its subject. Most common
|
||
patch types include :
|
||
|
||
- BUG fix for a bug. The severity of the bug should also be indicated
|
||
when known. Similarly, if a backport is needed to older versions,
|
||
it should be indicated on the last line of the commit message. If
|
||
the bug has been identified as a regression brought by a specific
|
||
patch or version, this indication will be appreciated too. New
|
||
maintenance releases are generally emitted when a few of these
|
||
patches are merged.
|
||
|
||
- CLEANUP code cleanup, silence of warnings, etc... theorically no impact.
|
||
These patches will rarely be seen in stable branches, though they
|
||
may appear when they remove some annoyance or when they make
|
||
backporting easier. By nature, a cleanup is always minor.
|
||
|
||
- REORG code reorganization. Some blocks may be moved to other places,
|
||
some important checks might be swapped, etc... These changes
|
||
always present a risk of regression. For this reason, they should
|
||
never be mixed with any bug fix nor functional change. Code is
|
||
only moved as-is. Indicating the risk of breakage is highly
|
||
recommended.
|
||
|
||
- BUILD updates or fixes for build issues. Changes to makefiles also fall
|
||
into this category. The risk of breakage should be indicated if
|
||
known. It is also appreciated to indicate what platforms and/or
|
||
configurations were tested after the change.
|
||
|
||
- OPTIM some code was optimised. Sometimes if the regression risk is very
|
||
low and the gains significant, such patches may be merged in the
|
||
stable branch. Depending on the amount of code changed or replaced
|
||
and the level of trust the author has in the change, the risk of
|
||
regression should be indicated.
|
||
|
||
- RELEASE release of a new version (development or stable).
|
||
|
||
- LICENSE licensing updates (may impact distro packagers).
|
||
|
||
|
||
When the patch cannot be categorized, it's best not to put any tag. This is
|
||
commonly the case for new features, which development versions are mostly made
|
||
of.
|
||
|
||
Additionally, the importance of the patch should be indicated when known. A
|
||
single upper-case word is preferred, among :
|
||
|
||
- MINOR minor change, very low risk of impact. It is often the case for
|
||
code additions that don't touch live code. For a bug, it generally
|
||
indicates an annoyance, nothing more.
|
||
|
||
- MEDIUM medium risk, may cause unexpected regressions of low importance or
|
||
which may quickly be discovered. For a bug, it generally indicates
|
||
something odd which requires changing the configuration in an
|
||
undesired way to work around the issue.
|
||
|
||
- MAJOR major risk of hidden regression. This happens when I rearrange
|
||
large parts of code, when I play with timeouts, with variable
|
||
initializations, etc... We should only exceptionally find such
|
||
patches in stable branches. For a bug, it indicates severe
|
||
reliability issues for which workarounds are identified with or
|
||
without performance impacts.
|
||
|
||
- CRITICAL medium-term reliability or security is at risk and workarounds,
|
||
if they exist, might not always be acceptable. An upgrade is
|
||
absolutely required. A maintenance release may be emitted even if
|
||
only one of these bugs are fixed. Note that this tag is only used
|
||
with bugs. Such patches must indicate what is the first version
|
||
affected, and if known, the commit ID which introduced the issue.
|
||
|
||
If this criterion doesn't apply, it's best not to put it. For instance, most
|
||
doc updates and most examples or test files are just added or updated without
|
||
any need to qualify a level of importance.
|
||
|
||
The area the patch applies to is quite important, because some areas are known
|
||
to be similar in older versions, suggesting a backport might be desirable, and
|
||
conversely, some areas are known to be specific to one version. When the tag is
|
||
used alone, uppercase is preferred for readability, otherwise lowercase is fine
|
||
too. The following tags are suggested but not limitative :
|
||
|
||
- doc documentation updates or fixes. No code is affected, no need to
|
||
upgrade. These patches can also be sent right after a new feature,
|
||
to document it.
|
||
|
||
- examples example files. Be careful, sometimes these files are packaged.
|
||
|
||
- tests regression test files. No code is affected, no need to upgrade.
|
||
|
||
- init initialization code, arguments parsing, etc...
|
||
|
||
- config configuration parser, mostly used when adding new config keywords
|
||
|
||
- http the HTTP engine
|
||
|
||
- stats the stats reporting engine as well as the stats socket CLI
|
||
|
||
- checks the health checks engine (eg: when adding new checks)
|
||
|
||
- acl the ACL processing core or some ACLs from other areas
|
||
|
||
- peers the peer synchronization engine
|
||
|
||
- listeners everything related to incoming connection settings
|
||
|
||
- frontend everything related to incoming connection processing
|
||
|
||
- backend everything related to LB algorithms and server farm
|
||
|
||
- session session processing and flags (very sensible, be careful)
|
||
|
||
- server server connection management, queueing
|
||
|
||
- proxy proxy maintenance (start/stop)
|
||
|
||
- log log management
|
||
|
||
- poll any of the pollers
|
||
|
||
- halog the halog sub-component in the contrib directory
|
||
|
||
- contrib any addition to the contrib directory
|
||
|
||
Other names may be invented when more precise indications are meaningful, for
|
||
instance : "cookie" which indicates cookie processing in the HTTP core. Last,
|
||
indicating the name of the affected file is also a good way to quickly spot
|
||
changes. Many commits were already tagged with "stream_sock" or "cfgparse" for
|
||
instance.
|
||
|
||
It is desired that AT LEAST one of the 3 criteria tags is reported in the patch
|
||
subject. Ideally, we would have the 3 most often. The two first criteria should
|
||
be present before a first colon (':'). If both are present, then they should be
|
||
delimited with a slash ('/'). The 3rd criterion (area) should appear next, also
|
||
followed by a colon. Thus, all of the following messages are valid :
|
||
|
||
Examples of messages :
|
||
- DOC: document options forwardfor to logasap
|
||
- DOC/MAJOR: reorganize the whole document and change indenting
|
||
- BUG: stats: connection reset counters must be plain ascii, not HTML
|
||
- BUG/MINOR: stats: connection reset counters must be plain ascii, not HTML
|
||
- MEDIUM: checks: support multi-packet health check responses
|
||
- RELEASE: Released version 1.4.2
|
||
- BUILD: stats: stdint is not present on solaris
|
||
- OPTIM/MINOR: halog: make fgets parse more bytes by blocks
|
||
- REORG/MEDIUM: move syscall redefinition to specific places
|
||
|
||
Please do not use square brackets anymore around the tags, because they give me
|
||
more work when merging patches. By default I'm asking Git to keep them but this
|
||
causes trouble when patches are prefixed with the [PATCH] tag because in order
|
||
not to store it, I have to hand-edit the patches. So as of now, I will ask Git
|
||
to remove whatever is located between square brackets, which implies that any
|
||
subject formatted the old way will have its tag stripped out.
|
||
|
||
In fact, one of the only square bracket tags that still makes sense is '[RFC]'
|
||
at the beginning of the subject, when you're asking for someone to review your
|
||
change before getting it merged. If the patch is OK to be merged, then I can
|
||
merge it as-is and the '[RFC]' tag will automatically be removed. If you don't
|
||
want it to be merged at all, you can simply state it in the message, or use an
|
||
alternate '[WIP]' tag ("work in progress").
|
||
|
||
The tags are not rigid, follow your intuition first, anyway I reserve the right
|
||
to change them when merging the patch. It may happen that a same patch has a
|
||
different tag in two distinct branches. The reason is that a bug in one branch
|
||
may just be a cleanup in the other one because the code cannot be triggered.
|
||
|
||
|
||
For a more efficient interaction between the mainline code and your code, I can
|
||
only strongly encourage you to try the Git version control system :
|
||
|
||
http://git-scm.com/
|
||
|
||
It's very fast, lightweight and lets you undo/redo your work as often as you
|
||
want, without making your mistakes visible to the rest of the world. It will
|
||
definitely help you contribute quality code and take other people's feedback
|
||
in consideration. In order to clone the HAProxy Git repository :
|
||
|
||
$ git clone http://git.1wt.eu/git/haproxy-1.4.git (stable 1.4)
|
||
$ git clone http://git.1wt.eu/git/haproxy.git/ (development)
|
||
|
||
The site above is slow, a faster mirror is maintained up to date here :
|
||
|
||
$ git clone http://master.formilux.org/git/people/willy/haproxy.git/
|
||
|
||
If you decide to use Git for your developments, then your commit messages will
|
||
have the subject line in the format described above, then the whole description
|
||
of your work (mainly why you did it) will be in the body. You can directly send
|
||
your commits to the mailing list, the format is convenient to read and process.
|
||
|
||
-- end
|