Menu
▾
▴
middle-man-commits — Middleman CVS commits mailing list
You can subscribe to this list here.
| 2004 |
Jan
(73) |
Feb
(54) |
Mar
(71) |
Apr
(14) |
May
|
Jun
(6) |
Jul
(6) |
Aug
(20) |
Sep
|
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
|
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: richa <ri...@te...> - 2008-02-06 11:09:58
|
Hi All, I have downloaded the middleman 2.0 ( WAP 2.0) code and using with our application behaving as the server. I am using the client simulator for initiating the browsing request to our application. I am using the freely available Valgrind memcheck tool for checking the memory leak. On performing the load test with application (Middle-Man 2.0), resulting the memory leak. Valgrind memcheck output is resulting with memory leak, status with valgrind application file name and line number. Analysis says, getting the memory leak in Middle-Man WAP 2.0 source code related libraries. Please let me know the memory leak related issue in Middle-Man WAP 2.0 source code. Thanks in advance, Richa |
|
From: richa <ri...@te...> - 2008-02-06 11:08:20
|
Hi All, I have downloaded the middleman 2.0 ( WAP 2.0) code and using with our application behaving as the server. I am using the client simulator for initiating the browsing request to our application. I am using the freely available Valgrind memcheck tool for checking the memory leak. On performing the load test with application (Middle-Man 2.0), resulting the memory leak. Valgrind memcheck output is resulting with memory leak, status with valgrind application file name and line number. Analysis says, getting the memory leak in Middle-Man WAP 2.0 source code related libraries. Please let me know the memory leak related issue in Middle-Man WAP 2.0 source code. Thanks in advance, Richa |
|
From: Joshua P. <jpr...@us...> - 2004-08-06 09:42:02
|
Update of /cvsroot/middle-man/middleman In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25628 Modified Files: CHANGELOG Log Message: fix memory leaks Index: CHANGELOG =================================================================== RCS file: /cvsroot/middle-man/middleman/CHANGELOG,v retrieving revision 1.170 retrieving revision 1.171 diff -C2 -d -r1.170 -r1.171 *** CHANGELOG 5 Aug 2004 18:30:42 -0000 1.170 --- CHANGELOG 6 Aug 2004 09:41:48 -0000 1.171 *************** *** 1,2 **** --- 1,3 ---- + - fix mem leaks in hash_insert, htmlstream_callback_add, Socket::CallBackAdd & unlink_list_add - send trailing \r\n after the postbody - add CACHE_NEW to CACHE_SESSION_FLAGS otherwise we pthread_cond_destroy uninitialized condvars |
|
From: Joshua P. <jpr...@us...> - 2004-08-06 09:42:02
|
Update of /cvsroot/middle-man/middleman/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25628/include Modified Files: proto.h Log Message: fix memory leaks Index: proto.h =================================================================== RCS file: /cvsroot/middle-man/middleman/include/proto.h,v retrieving revision 1.195 retrieving revision 1.196 diff -C2 -d -r1.195 -r1.196 *** proto.h 5 Aug 2004 08:07:47 -0000 1.195 --- proto.h 6 Aug 2004 09:41:48 -0000 1.196 *************** *** 330,335 **** Filebuf *cache_to_filebuf(CACHEMAP *, size_t); int cacheable(HEADER *); ! void unlink_list_add(char *); ! void unlink_list_zap(char *); void unlink_thread(); --- 330,335 ---- Filebuf *cache_to_filebuf(CACHEMAP *, size_t); int cacheable(HEADER *); ! void unlink_list_add(const char *); ! void unlink_list_zap(const char *); void unlink_thread(); |
|
From: Joshua P. <jpr...@us...> - 2004-08-06 09:42:02
|
Update of /cvsroot/middle-man/middleman/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25628/src Modified Files: cache.c hash.c hstream.c socket.c Log Message: fix memory leaks Index: hstream.c =================================================================== RCS file: /cvsroot/middle-man/middleman/src/hstream.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** hstream.c 11 Mar 2004 22:27:16 -0000 1.8 --- hstream.c 6 Aug 2004 09:41:49 -0000 1.9 *************** *** 268,272 **** cb->arg = arg; ! hl = hash_insert(hs->callbacks, xstrdup(tag), cb); return TRUE; --- 268,272 ---- cb->arg = arg; ! hl = hash_insert(hs->callbacks, tag, cb); return TRUE; Index: cache.c =================================================================== RCS file: /cvsroot/middle-man/middleman/src/cache.c,v retrieving revision 1.139 retrieving revision 1.140 diff -C2 -d -r1.139 -r1.140 *** cache.c 4 Aug 2004 06:02:57 -0000 1.139 --- cache.c 6 Aug 2004 09:41:49 -0000 1.140 *************** *** 1584,1592 **** } ! void unlink_list_add(char *file) { pthread_mutex_lock(&global->unlink_lock); ! global->unlink_list->push_back(*(new string(file))); pthread_cond_signal(&global->unlink_cond); --- 1584,1592 ---- } ! void unlink_list_add(const char *file) { pthread_mutex_lock(&global->unlink_lock); ! global->unlink_list->push_back(file); pthread_cond_signal(&global->unlink_cond); *************** *** 1596,1600 **** ! void unlink_list_zap(char *file) { UnlinkList::iterator item; --- 1596,1600 ---- ! void unlink_list_zap(const char *file) { UnlinkList::iterator item; Index: socket.c =================================================================== RCS file: /cvsroot/middle-man/middleman/src/socket.c,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** socket.c 13 Jun 2004 21:06:39 -0000 1.34 --- socket.c 6 Aug 2004 09:41:49 -0000 1.35 *************** *** 142,153 **** int Socket::CallBackAdd(int (*func) (void *, int, char *), void *arg, int events) { ! SocketCallBack *scb = xnew SocketCallBack(func, arg); ! scb->id = cbid++; ! scb->events = events; ! callback_list.push_back(*scb); ! return scb->id; } --- 142,153 ---- int Socket::CallBackAdd(int (*func) (void *, int, char *), void *arg, int events) { ! SocketCallBack scb(func, arg); ! scb.id = cbid++; ! scb.events = events; ! callback_list.push_back(scb); ! return scb.id; } Index: hash.c =================================================================== RCS file: /cvsroot/middle-man/middleman/src/hash.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** hash.c 11 Mar 2004 22:27:16 -0000 1.15 --- hash.c 6 Aug 2004 09:41:49 -0000 1.16 *************** *** 63,67 **** insert item into hash table */ ! struct HASH_LIST *hash_insert(HASH_TABLE * hash_table, const char *ref, void *string) { unsigned int key; --- 63,67 ---- insert item into hash table */ ! struct HASH_LIST *hash_insert(HASH_TABLE * hash_table, const char *ref, void *data) { unsigned int key; *************** *** 71,76 **** hash_list = hash_search(hash_table, ref); ! if (hash_list != NULL) return hash_list; key = hash_key(hash_table->size, ref); --- 71,78 ---- hash_list = hash_search(hash_table, ref); ! if (hash_list != NULL) { ! xfree(data); return hash_list; + } key = hash_key(hash_table->size, ref); *************** *** 78,82 **** hash_list = hash_table->hash_list[key]; ! HASH_LIST_ADD(hash_list, ref, string); if (hash_table->hash_list[key] == NULL) --- 80,84 ---- hash_list = hash_table->hash_list[key]; ! HASH_LIST_ADD(hash_list, ref, data); if (hash_table->hash_list[key] == NULL) |
|
From: Joshua P. <jpr...@us...> - 2004-08-05 18:30:56
|
Update of /cvsroot/middle-man/middleman/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25525/src Modified Files: proto_http.c protocol.c Log Message: follow spec on POST Index: proto_http.c =================================================================== RCS file: /cvsroot/middle-man/middleman/src/proto_http.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** proto_http.c 20 Jun 2004 21:26:30 -0000 1.17 --- proto_http.c 5 Aug 2004 18:30:43 -0000 1.18 *************** *** 72,77 **** /* I hate abusing GOTO's like this... but I'm lazy :) */ auth_finished: ! if (connection->postbody != NULL) net_filebuf_send(connection->postbody, connection, SERVER); reget_header: --- 72,79 ---- /* I hate abusing GOTO's like this... but I'm lazy :) */ auth_finished: ! if (connection->postbody != NULL) { net_filebuf_send(connection->postbody, connection, SERVER); + connection->server->PutSock("\r\n"); + } reget_header: Index: protocol.c =================================================================== RCS file: /cvsroot/middle-man/middleman/src/protocol.c,v retrieving revision 1.170 retrieving revision 1.171 diff -C2 -d -r1.170 -r1.171 *** protocol.c 2 Apr 2004 10:03:05 -0000 1.170 --- protocol.c 5 Aug 2004 18:30:43 -0000 1.171 *************** *** 512,517 **** header_send(connection->header, connection, SERVER, (connection->proxy_type == PROXY_NORMAL) ? HEADER_FORWARD : HEADER_DIRECT); ! if (connection->postbody != NULL) net_filebuf_send(connection->postbody, connection, SERVER); headbuf = header_get(connection, SERVER, timeout); --- 512,519 ---- header_send(connection->header, connection, SERVER, (connection->proxy_type == PROXY_NORMAL) ? HEADER_FORWARD : HEADER_DIRECT); ! if (connection->postbody != NULL) { net_filebuf_send(connection->postbody, connection, SERVER); + connection->server->PutSock("\r\n"); + } headbuf = header_get(connection, SERVER, timeout); |
|
From: Joshua P. <jpr...@us...> - 2004-08-05 18:30:56
|
Update of /cvsroot/middle-man/middleman In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25525 Modified Files: CHANGELOG Log Message: follow spec on POST Index: CHANGELOG =================================================================== RCS file: /cvsroot/middle-man/middleman/CHANGELOG,v retrieving revision 1.169 retrieving revision 1.170 diff -C2 -d -r1.169 -r1.170 *** CHANGELOG 5 Aug 2004 08:07:47 -0000 1.169 --- CHANGELOG 5 Aug 2004 18:30:42 -0000 1.170 *************** *** 1,2 **** --- 1,3 ---- + - send trailing \r\n after the postbody - add CACHE_NEW to CACHE_SESSION_FLAGS otherwise we pthread_cond_destroy uninitialized condvars - header_length should return the maximum length on failure instead of -1 |
|
From: Joshua P. <jpr...@us...> - 2004-08-05 08:07:59
|
Update of /cvsroot/middle-man/middleman In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8300 Modified Files: CHANGELOG Log Message: two minor fixes Index: CHANGELOG =================================================================== RCS file: /cvsroot/middle-man/middleman/CHANGELOG,v retrieving revision 1.168 retrieving revision 1.169 diff -C2 -d -r1.168 -r1.169 *** CHANGELOG 5 Aug 2004 07:35:43 -0000 1.168 --- CHANGELOG 5 Aug 2004 08:07:47 -0000 1.169 *************** *** 1,2 **** --- 1,4 ---- + - add CACHE_NEW to CACHE_SESSION_FLAGS otherwise we pthread_cond_destroy uninitialized condvars + - header_length should return the maximum length on failure instead of -1 - expand on transparent proxying in Linux - better docs for URL commands |
|
From: Joshua P. <jpr...@us...> - 2004-08-05 08:07:59
|
Update of /cvsroot/middle-man/middleman/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8300/src Modified Files: header.c Log Message: two minor fixes Index: header.c =================================================================== RCS file: /cvsroot/middle-man/middleman/src/header.c,v retrieving revision 1.135 retrieving revision 1.136 diff -C2 -d -r1.135 -r1.136 *** header.c 2 Apr 2004 10:03:05 -0000 1.135 --- header.c 5 Aug 2004 08:07:47 -0000 1.136 *************** *** 863,867 **** } ! int header_length(char *buf, size_t len) { int x = 0, nlcount = 0; --- 863,867 ---- } ! size_t header_length(char *buf, size_t len) { int x = 0, nlcount = 0; *************** *** 877,881 **** } ! return -1; } --- 877,881 ---- } ! return len; } |
|
From: Joshua P. <jpr...@us...> - 2004-08-05 08:07:59
|
Update of /cvsroot/middle-man/middleman/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8300/include Modified Files: flags.h proto.h Log Message: two minor fixes Index: flags.h =================================================================== RCS file: /cvsroot/middle-man/middleman/include/flags.h,v retrieving revision 1.82 retrieving revision 1.83 diff -C2 -d -r1.82 -r1.83 *** flags.h 2 Apr 2004 14:31:36 -0000 1.82 --- flags.h 5 Aug 2004 08:07:47 -0000 1.83 *************** *** 181,185 **** /* flags which are masked off from journal entries */ ! #define CACHE_SESSION_FLAGS (CACHE_EXPIRED | CACHE_VALIDATE | CACHE_PREFETCHED | CACHE_MEM | CACHE_VIOLATION) #define CONNECTION_BUFFER 1 /* file to be buffered */ --- 181,185 ---- /* flags which are masked off from journal entries */ ! #define CACHE_SESSION_FLAGS (CACHE_EXPIRED | CACHE_VALIDATE | CACHE_PREFETCHED | CACHE_MEM | CACHE_VIOLATION | CACHE_NEW) #define CONNECTION_BUFFER 1 /* file to be buffered */ Index: proto.h =================================================================== RCS file: /cvsroot/middle-man/middleman/include/proto.h,v retrieving revision 1.194 retrieving revision 1.195 diff -C2 -d -r1.194 -r1.195 *** proto.h 5 Aug 2004 02:01:16 -0000 1.194 --- proto.h 5 Aug 2004 08:07:47 -0000 1.195 *************** *** 109,113 **** HEADER *http_header_parse_response(char *); HEADER *http_header_dup(HEADER *); ! int header_length(char *, size_t); void http_header_list_parse(HEADER *, char *); void http_header_free(HEADER *); --- 109,113 ---- HEADER *http_header_parse_response(char *); HEADER *http_header_dup(HEADER *); ! size_t header_length(char *, size_t); void http_header_list_parse(HEADER *, char *); void http_header_free(HEADER *); |
|
From: Joshua P. <jpr...@us...> - 2004-08-05 07:35:54
|
Update of /cvsroot/middle-man/middleman/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4040/doc Modified Files: Makefile manual.xml Log Message: minor fixes & additions to manual Index: manual.xml =================================================================== RCS file: /cvsroot/middle-man/middleman/doc/manual.xml,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** manual.xml 10 Jul 2004 10:27:00 -0000 1.27 --- manual.xml 5 Aug 2004 07:35:44 -0000 1.28 *************** *** 4,17 **** <!ENTITY bool "Boolean"> <!ENTITY string "String"> ! <!ENTITY multiline_string "Multiline string"> ! <!ENTITY string_select_one "Radio buttons"> ! <!ENTITY string_select_many "Checkboxes"> ! <!ENTITY string_list "<link linkend=STRING_LIST>STRING_LIST</link>"> ! <!ENTITY ip_range_list "<link linkend=IP_RANGE_LIST>IP_RANGE_LIST</link>"> ! <!ENTITY port_range_list "<link linkend=PORT_RANGE_LIST>PORT_RANGE_LIST</link>"> ! <!ENTITY string_range "Two strings"> ! <!ENTITY int_range "<link linkend=INT>Two integers</link>"> ! <!ENTITY file_size "<link linkend=FILE_SIZE>FILE_SIZE</link>"> ! <!ENTITY mutiline_string "Multiline text"> <!ENTITY opthead "<thead><row><entry>Option</entry><entry>Type</entry><entry>Description</entry></row></thead>"> ]> --- 4,17 ---- <!ENTITY bool "Boolean"> <!ENTITY string "String"> ! <!ENTITY multiline-string "Multiline string"> ! <!ENTITY string-select-one "Radio buttons"> ! <!ENTITY string-select-many "Checkboxes"> ! <!ENTITY string-list "<link linkend=STRING-LIST>STRING_LIST</link>"> ! <!ENTITY ip-range-list "<link linkend=IP-RANGE-LIST>IP_RANGE_LIST</link>"> ! <!ENTITY port-range-list "<link linkend=PORT-RANGE-LIST>PORT_RANGE_LIST</link>"> ! <!ENTITY string-range "Two strings"> ! <!ENTITY int-range "<link linkend=INT>Two integers</link>"> ! <!ENTITY file-size "<link linkend=FILE-SIZE>FILE_SIZE</link>"> ! <!ENTITY mutiline-string "Multiline text"> <!ENTITY opthead "<thead><row><entry>Option</entry><entry>Type</entry><entry>Description</entry></row></thead>"> ]> *************** *** 127,134 **** added to the front of the requested file with the URL command inside; for example, "http://proxyip:port/bypass../somefile". URL commands are not only taken from the request URL, but from ! the Referer header sent by your browser as well; this allows them to work for images and files loaded from a website a URL ! command was used on. Additionally, URL commands are automatically prefixed to the Location: header sent back when a 302 redirect is received or when a redirect rule that sends a --- 127,141 ---- added to the front of the requested file with the URL command inside; for example, "http://proxyip:port/bypass../somefile". + This might seem like a cool feature, but many consumer-oriented + web browsers do a DNS lookup or otherwise attempt to interpret + the URL prior to sending any request. In short, this means + that many browsers won't allow you to use URL commands. Fortunately, URL commands are not only taken from the request URL, but from ! the Referer header as well (this allows them to work for images and files loaded from a website a URL ! command was used on). For example, ! "wget --referer 'profiles..' http://host.com/path/to/img.jpg" ! The command line tool "lwp-request" is another good choice. ! Additionally, URL commands are automatically prefixed to the Location: header sent back when a 302 redirect is received or when a redirect rule that sends a *************** *** 396,400 **** </simplesect> ! <simplesect id="FILE_SIZE"> <title>FILE_SIZE</title> <para>An unsigned integer followed by "K" for kilo bytes, "M" for --- 403,407 ---- </simplesect> ! <simplesect id="FILE-SIZE"> <title>FILE_SIZE</title> <para>An unsigned integer followed by "K" for kilo bytes, "M" for *************** *** 402,406 **** </simplesect> ! <simplesect id="STRING_LIST"> <title>STRING_LIST</title> <para>A comma separated list of strings, like : "apple,orange,banana" --- 409,413 ---- </simplesect> ! <simplesect id="STRING-LIST"> <title>STRING_LIST</title> <para>A comma separated list of strings, like : "apple,orange,banana" *************** *** 408,412 **** </simplesect> ! <simplesect id="IP_RANGE_LIST"> <title>IP_RANGE_LIST</title> <para>Each IP or IP range should be separated by a comma. An IP --- 415,419 ---- </simplesect> ! <simplesect id="IP-RANGE-LIST"> <title>IP_RANGE_LIST</title> <para>Each IP or IP range should be separated by a comma. An IP *************** *** 416,420 **** </simplesect> ! <simplesect id="PORT_RANGE_LIST"> <title>PORT_RANGE_LIST</title> <para>Each port or port range should be separated by a comma. A port --- 423,427 ---- </simplesect> ! <simplesect id="PORT-RANGE-LIST"> <title>PORT_RANGE_LIST</title> <para>Each port or port range should be separated by a comma. A port *************** *** 463,467 **** <row> <entry>Maximum buffer size</entry> ! <entry>&file_size;</entry> <entry>The maximum size in bytes of files that are buffered and processed by the <link linkend="rewrite">rewrite</link>, --- 470,474 ---- <row> <entry>Maximum buffer size</entry> ! <entry>&file-size;</entry> <entry>The maximum size in bytes of files that are buffered and processed by the <link linkend="rewrite">rewrite</link>, *************** *** 482,486 **** <row> <entry>CONNECT ports</entry> ! <entry>&port_range_list;</entry> <entry>The ports outgoing CONNECT requests are allowed to be made to; </entry> --- 489,493 ---- <row> <entry>CONNECT ports</entry> ! <entry>&port-range-list;</entry> <entry>The ports outgoing CONNECT requests are allowed to be made to; </entry> *************** *** 607,611 **** <row> <entry>Blocked IP addresses</entry> ! <entry>&ip_range_list;</entry> <entry>A comma separated list of IP addresses that can be returned when doing the DNS lookup which will cause the page to be --- 614,618 ---- <row> <entry>Blocked IP addresses</entry> ! <entry>&ip-range-list;</entry> <entry>A comma separated list of IP addresses that can be returned when doing the DNS lookup which will cause the page to be *************** *** 663,667 **** <row> <entry>Maximum file size</entry> ! <entry>&file_size;</entry> <entry>The maximum size of the prefetched file.</entry> </row> --- 670,674 ---- <row> <entry>Maximum file size</entry> ! <entry>&file-size;</entry> <entry>The maximum size of the prefetched file.</entry> </row> *************** *** 747,751 **** <row> <entry>Port range list</entry> ! <entry>&port_range_list;</entry> <entry>A comma seperated list of ports or port ranges this entyr applies to.</entry> --- 754,758 ---- <row> <entry>Port range list</entry> ! <entry>&port-range-list;</entry> <entry>A comma seperated list of ports or port ranges this entyr applies to.</entry> *************** *** 753,757 **** <row> <entry>Added profiles</entry> ! <entry>&string_list;</entry> <entry>A comma separated list of profiles to add when this entry matches.</entry> --- 760,764 ---- <row> <entry>Added profiles</entry> ! <entry>&string-list;</entry> <entry>A comma separated list of profiles to add when this entry matches.</entry> *************** *** 759,763 **** <row> <entry>Removed profiles</entry> ! <entry>&string_list;</entry> <entry>A comma separated list of profiles to remove when this entry matches.</entry> --- 766,770 ---- <row> <entry>Removed profiles</entry> ! <entry>&string-list;</entry> <entry>A comma separated list of profiles to remove when this entry matches.</entry> *************** *** 765,769 **** <row> <entry>URL Command</entry> ! <entry>&string_list;</entry> <entry>A comma seperated list of URL commands which will activate this entry. If left empty, this entry is enabled regardless of --- 772,776 ---- <row> <entry>URL Command</entry> ! <entry>&string-list;</entry> <entry>A comma seperated list of URL commands which will activate this entry. If left empty, this entry is enabled regardless of *************** *** 888,897 **** <row> <entry>Memory cache size</entry> ! <entry>&file_size;</entry> <entry>The maximum size in bytes of the memory cache.</entry> </row> <row> <entry>Memory free extra</entry> ! <entry>&file_size;</entry> <entry>The number of additional bytes to free up when the memory is cleaned.</entry> --- 895,904 ---- <row> <entry>Memory cache size</entry> ! <entry>&file-size;</entry> <entry>The maximum size in bytes of the memory cache.</entry> </row> <row> <entry>Memory free extra</entry> ! <entry>&file-size;</entry> <entry>The number of additional bytes to free up when the memory is cleaned.</entry> *************** *** 899,908 **** <row> <entry>Minimum file size</entry> ! <entry>&file_size;</entry> <entry>The minimum file size in bytes of any cached file.</entry> </row> <row> <entry>Maximum file size</entry> ! <entry>&file_size;</entry> <entry>The maximum file size in bytes of any cached file; if set to 0, no maximum file size is imposed.</entry> --- 906,915 ---- <row> <entry>Minimum file size</entry> ! <entry>&file-size;</entry> <entry>The minimum file size in bytes of any cached file.</entry> </row> <row> <entry>Maximum file size</entry> ! <entry>&file-size;</entry> <entry>The maximum file size in bytes of any cached file; if set to 0, no maximum file size is imposed.</entry> *************** *** 910,914 **** <row> <entry>Maximum wait size</entry> ! <entry>&file_size;</entry> <entry>It's not possible with the current design for one thread to download a file being cached by another thread, but that thread --- 917,921 ---- <row> <entry>Maximum wait size</entry> ! <entry>&file-size;</entry> <entry>It's not possible with the current design for one thread to download a file being cached by another thread, but that thread *************** *** 959,963 **** <row> <entry>Maximum disk size</entry> ! <entry>&file_size;</entry> <entry>The amount of space that should be used to store cached files in this directory.</entry> --- 966,970 ---- <row> <entry>Maximum disk size</entry> ! <entry>&file-size;</entry> <entry>The amount of space that should be used to store cached files in this directory.</entry> *************** *** 965,969 **** <row> <entry>Disk free extra</entry> ! <entry>&file_size;</entry> <entry>When the cache is cleaned, this additional amount will be freed as well. This option can be useful to prevent the cache --- 972,976 ---- <row> <entry>Disk free extra</entry> ! <entry>&file-size;</entry> <entry>When the cache is cleaned, this additional amount will be freed as well. This option can be useful to prevent the cache *************** *** 1453,1457 **** <row> <entry>Replace</entry> ! <entry>&multiline_string;</entry> <entry>The replacement text to use in place of the area of text matching the pattern; it may contain back references to strings --- 1460,1464 ---- <row> <entry>Replace</entry> ! <entry>&multiline-string;</entry> <entry>The replacement text to use in place of the area of text matching the pattern; it may contain back references to strings *************** *** 1472,1476 **** <row> <entry>Applies to</entry> ! <entry>&string_select_many;</entry> <entry><para> This option is to select what the rewrite rule applies to; --- 1479,1483 ---- <row> <entry>Applies to</entry> ! <entry>&string-select-many;</entry> <entry><para> This option is to select what the rewrite rule applies to; *************** *** 1861,1866 **** </para> ! <para>iptables -t nat -A PREROUTING -i eth0 -p tcp --dport ! http -j REDIRECT --to-port 8080</para> </chapter> --- 1868,1893 ---- </para> ! <programlisting>iptables -t nat -A PREROUTING -i eth0 -p tcp --dport http -j REDIRECT --to-port 8080</programlisting> ! ! <para>If you don't want to use a separate machine as a transparent ! proxy then you can set up the transparent proxy on the same machine as ! the browser. This is more complicated so don't attempt this unless ! you are a (wannabe) networking guru.</para> ! ! <programlisting>gid=`id -g proxy` ! iptables -t nat -A OUTPUT -p tcp --dport 80 -m owner --gid-owner $gid -j ACCEPT ! iptables -t nat -A OUTPUT -p tcp --dport 80 -j DNAT --to-destination 192.168.0.2:8080 ! </programlisting> ! ! <para>The address 192.168.0.2 is just an instance of the loopback ! interface, which can be created like this:</para> ! ! <programlisting>ifconfig lo add 192.168.0.2 ! ifconfig lo:0 netmask 255.255.255.255 ! </programlisting> ! ! <para>(These commands assume that your normal loopback is ! already configured on 127.0.0.1 and you have no other loopbacks.)</para> ! </chapter> Index: Makefile =================================================================== RCS file: /cvsroot/middle-man/middleman/doc/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 15 Jan 2004 16:17:13 -0000 1.2 --- Makefile 5 Aug 2004 07:35:44 -0000 1.3 *************** *** 11,15 **** # http://docbook.sourceforge.net/projects/dsssl/ # ! STYLESHEET=/home/riadh/download/docbook-dsssl-1.78/html/docbook.dsl all: --- 11,17 ---- # http://docbook.sourceforge.net/projects/dsssl/ # ! ! # for debian, simply install docbook-dsssl ! STYLESHEET=/usr/share/sgml/docbook/stylesheet/dsssl/modular/html/docbook.dsl all: |
![http://host.com/path/to/img.jpg"](http://host.com/path/to/img.jpg"){kind=link}
|
From: Joshua P. <jpr...@us...> - 2004-08-05 07:35:53
|
Update of /cvsroot/middle-man/middleman In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4040 Modified Files: CHANGELOG Log Message: minor fixes & additions to manual Index: CHANGELOG =================================================================== RCS file: /cvsroot/middle-man/middleman/CHANGELOG,v retrieving revision 1.167 retrieving revision 1.168 diff -C2 -d -r1.167 -r1.168 *** CHANGELOG 5 Aug 2004 06:00:33 -0000 1.167 --- CHANGELOG 5 Aug 2004 07:35:43 -0000 1.168 *************** *** 1,2 **** --- 1,5 ---- + - expand on transparent proxying in Linux + - better docs for URL commands + - fix the manual for docbook 1.78 - log error if the disk cache can't create files - better diagnostics for loading config files |
|
From: Joshua P. <jpr...@us...> - 2004-08-05 06:00:42
|
Update of /cvsroot/middle-man/middleman In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24647 Modified Files: CHANGELOG AUTHORS Log Message: doc changes Index: CHANGELOG =================================================================== RCS file: /cvsroot/middle-man/middleman/CHANGELOG,v retrieving revision 1.166 retrieving revision 1.167 diff -C2 -d -r1.166 -r1.167 *** CHANGELOG 10 Jul 2004 10:27:00 -0000 1.166 --- CHANGELOG 5 Aug 2004 06:00:33 -0000 1.167 *************** *** 1,2 **** --- 1,7 ---- + - log error if the disk cache can't create files + - better diagnostics for loading config files + - fix silly typo in cache initialization which was causing absurd memory cache stats + - fix AccessSection::setup to only cache the access profiles and reset the profiles only in the main loop + - use pcre-config to detect an installed libpcre - fixed a bug that caused an incorrect status code to be returned for internal templates. - added 'prefetch' URL command to prefetch the URL without displaying it in the browser. Index: AUTHORS =================================================================== RCS file: /cvsroot/middle-man/middleman/AUTHORS,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** AUTHORS 25 Jan 2004 21:14:10 -0000 1.5 --- AUTHORS 5 Aug 2004 06:00:33 -0000 1.6 *************** *** 8,9 **** --- 8,10 ---- Jan Becvar - 'size' option for rewrite, keywords, and external features. Mario Peschel - debian packages. + Joshua Nathaniel Pritikin <jpr...@po...> - bug reports, patches & etc. |
|
From: Joshua P. <jpr...@us...> - 2004-08-05 02:01:25
|
Update of /cvsroot/middle-man/middleman In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26192 Modified Files: Makefile.in configure configure.ac Log Message: 1. Revert yesterday's patch removing some local variables. Instead of removing, move them into a tighter scope. 2. Detect libpcre using pcre-config (similar to pkg-config). Index: Makefile.in =================================================================== RCS file: /cvsroot/middle-man/middleman/Makefile.in,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** Makefile.in 5 Jul 2004 21:21:43 -0000 1.62 --- Makefile.in 5 Aug 2004 02:01:15 -0000 1.63 *************** *** 27,35 **** CC = @CC@ CXX = @CXX@ VERSION = @PACKAGE_VERSION@ CFLAGS = @CFLAGS@ -Iinclude -I. -Wall -D_GNU_SOURCE -DVERSION=\"$(VERSION)\" ! CXXFLAGS = @CXXFLAGS@ -Iinclude -I. -Wall -Wno-sign-compare -Wno-unknown-pragmas -Wno-format -D_GNU_SOURCE -DVERSION=\"$(VERSION)\" LDFLAGS = @LDFLAGS@ ! LIBS = @LIBS@ DEFS = @DEFS@ -D_REENTRANT MMAN_OBJS = src/global.o src/ssl.o src/stats.o src/cache.o src/access.o src/filter.o src/log.o src/main.o src/network.o src/socket.o src/header.o src/template.o src/cookies.o src/misc.o src/mem.o src/signal.o src/protocol.o src/proto_http.o src/proto_ftp.o src/proto_connect.o src/compat.o src/hash.o src/rewrite.o src/external.o src/mime.o src/regexp.o src/interface.o src/redirect.o src/forward.o src/keywords.o src/limits.o src/profiles.o src/dirlist.o src/pool.o src/timers.o src/filebuf.o src/prefetch.o src/hstream.o src/base64.o src/section.o src/xml.o src/fetch.o src/sync.o src/antivirus.o src/dnsbl.o --- 27,37 ---- CC = @CC@ CXX = @CXX@ + PCRE_CFLAGS = @PCRE_CFLAGS@ + PCRE_LIBS = @PCRE_LIBS@ VERSION = @PACKAGE_VERSION@ CFLAGS = @CFLAGS@ -Iinclude -I. -Wall -D_GNU_SOURCE -DVERSION=\"$(VERSION)\" ! CXXFLAGS = @CXXFLAGS@ $(PCRE_CFLAGS) -Iinclude -I. -Wall -Wno-sign-compare -Wno-unknown-pragmas -Wno-format -D_GNU_SOURCE -DVERSION=\"$(VERSION)\" LDFLAGS = @LDFLAGS@ ! LIBS = @LIBS@ $(PCRE_LIBS) DEFS = @DEFS@ -D_REENTRANT MMAN_OBJS = src/global.o src/ssl.o src/stats.o src/cache.o src/access.o src/filter.o src/log.o src/main.o src/network.o src/socket.o src/header.o src/template.o src/cookies.o src/misc.o src/mem.o src/signal.o src/protocol.o src/proto_http.o src/proto_ftp.o src/proto_connect.o src/compat.o src/hash.o src/rewrite.o src/external.o src/mime.o src/regexp.o src/interface.o src/redirect.o src/forward.o src/keywords.o src/limits.o src/profiles.o src/dirlist.o src/pool.o src/timers.o src/filebuf.o src/prefetch.o src/hstream.o src/base64.o src/section.o src/xml.o src/fetch.o src/sync.o src/antivirus.o src/dnsbl.o *************** *** 50,54 **** pcre/dftables: ! $(CC) -o pcre/dftables $(CFLAGS) pcre/dftables.c pcre/chartables.c: pcre/dftables --- 52,56 ---- pcre/dftables: ! $(CC) -o pcre/dftables $(CFLAGS) $(PCRE_CFLAGS) pcre/dftables.c pcre/chartables.c: pcre/dftables *************** *** 59,63 **** pcre/%.o: pcre/%.c ! $(CC) -c $(CFLAGS) $(DEFS) $< -o $@ libntlm/%.o: libntlm/%.c --- 61,65 ---- pcre/%.o: pcre/%.c ! $(CC) -c $(CFLAGS) $(PCRE_CFLAGS) $(DEFS) $< -o $@ libntlm/%.o: libntlm/%.c Index: configure.ac =================================================================== RCS file: /cvsroot/middle-man/middleman/configure.ac,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** configure.ac 5 Jul 2004 21:21:43 -0000 1.48 --- configure.ac 5 Aug 2004 02:01:15 -0000 1.49 *************** *** 41,55 **** PCRE_OBJS="pcre/get.o pcre/study.o pcre/chartables.o pcre/pcre.o pcre/pcreposix.o" ! AC_CHECK_LIB(pcre, pcre_compile, [have_pcre=yes], [have_pcre=no]) ! if test $have_pcre = "yes"; then ! AC_CHECK_LIB(pcreposix, pcreposix_regcomp, [have_pcreposix=yes], [have_pcreposix=no]) ! if test $have_pcreposix = "yes"; then ! AC_DEFINE(HAVE_PCRE, 1, [PCRE installed]) ! PCRE_OBJS="" ! LIBS="${LIBS} -lpcre -lpcreposix" ! fi ! fi # Check for zlib --- 41,68 ---- PCRE_OBJS="pcre/get.o pcre/study.o pcre/chartables.o pcre/pcre.o pcre/pcreposix.o" ! if test -z "$PCRE_CONFIG"; then ! AC_PATH_PROG(PCRE_CONFIG, pcre-config, no) ! fi ! if test $PCRE_CONFIG = "no"; then ! echo "*** pcre-config not found." ! echo "*** The pcre library will be linked statically." ! AC_MSG_CHECKING(PCRE_CFLAGS) ! PCRE_CFLAGS="-Ipcre" ! AC_MSG_RESULT($PCRE_CFLAGS) ! else ! AC_MSG_CHECKING(PCRE_CFLAGS) ! PCRE_CFLAGS=`$PCRE_CONFIG --cflags-posix` ! AC_MSG_RESULT($PCRE_CFLAGS) ! ! AC_MSG_CHECKING(PCRE_LIBS) ! PCRE_LIBS=`$PCRE_CONFIG --libs-posix` ! AC_MSG_RESULT($PCRE_LIBS) ! ! PCRE_OBJS="" ! fi ! AC_SUBST(PCRE_CFLAGS) ! AC_SUBST(PCRE_LIBS) # Check for zlib *************** *** 157,160 **** --- 170,177 ---- AC_OUTPUT(Makefile) + + + + echo "" echo ' _ __ ____ ' Index: configure =================================================================== RCS file: /cvsroot/middle-man/middleman/configure,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** configure 5 Jul 2004 21:21:43 -0000 1.40 --- configure 5 Aug 2004 02:01:15 -0000 1.41 *************** *** 312,316 **** ac_default_prefix=/opt/middleman ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS STRIP INSTALL PCRE_OBJS PAM_OBJS LIBNTLM_OBJS TINYXML_OBJS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP EGREP LIBOBJS LTLIBOBJS' ac_subst_files='' --- 312,316 ---- ac_default_prefix=/opt/middleman ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS STRIP INSTALL PCRE_OBJS PAM_OBJS LIBNTLM_OBJS TINYXML_OBJS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP EGREP PCRE_CONFIG PCRE_CFLAGS PCRE_LIBS LIBOBJS LTLIBOBJS' ac_subst_files='' *************** *** 2150,2155 **** (exit $ac_status); }; }; then for ac_declaration in \ ! ''\ ! '#include <stdlib.h>' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \ --- 2150,2154 ---- (exit $ac_status); }; }; then for ac_declaration in \ ! '' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \ *************** *** 2165,2170 **** cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include <stdlib.h> $ac_declaration int main () --- 2164,2169 ---- cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_declaration + #include <stdlib.h> int main () *************** *** 2476,2481 **** fi for ac_declaration in \ ! ''\ ! '#include <stdlib.h>' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \ --- 2475,2479 ---- fi for ac_declaration in \ ! '' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \ *************** *** 2491,2496 **** cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include <stdlib.h> $ac_declaration int main () --- 2489,2494 ---- cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_declaration + #include <stdlib.h> int main () *************** *** 3390,3526 **** PCRE_OBJS="pcre/get.o pcre/study.o pcre/chartables.o pcre/pcre.o pcre/pcreposix.o" ! echo "$as_me:$LINENO: checking for pcre_compile in -lpcre" >&5 ! echo $ECHO_N "checking for pcre_compile in -lpcre... $ECHO_C" >&6 ! if test "${ac_cv_lib_pcre_pcre_compile+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! ac_check_lib_save_LIBS=$LIBS ! LIBS="-lpcre $LIBS" ! cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ ! ! /* Override any gcc2 internal prototype to avoid an error. */ ! #ifdef __cplusplus ! extern "C" ! #endif ! /* We use char because int might match the return type of a gcc2 ! builtin and then its argument prototype would still apply. */ ! char pcre_compile (); ! int ! main () ! { ! pcre_compile (); ! ; ! return 0; ! } ! _ACEOF ! rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ! (eval $ac_link) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } && ! { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then ! ac_cv_lib_pcre_pcre_compile=yes ! else ! echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_pcre_pcre_compile=no ! fi ! rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ! LIBS=$ac_check_lib_save_LIBS fi ! echo "$as_me:$LINENO: result: $ac_cv_lib_pcre_pcre_compile" >&5 ! echo "${ECHO_T}$ac_cv_lib_pcre_pcre_compile" >&6 ! if test $ac_cv_lib_pcre_pcre_compile = yes; then ! have_pcre=yes else ! have_pcre=no fi ! if test $have_pcre = "yes"; then ! echo "$as_me:$LINENO: checking for pcreposix_regcomp in -lpcreposix" >&5 ! echo $ECHO_N "checking for pcreposix_regcomp in -lpcreposix... $ECHO_C" >&6 ! if test "${ac_cv_lib_pcreposix_pcreposix_regcomp+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! ac_check_lib_save_LIBS=$LIBS ! LIBS="-lpcreposix $LIBS" ! cat >conftest.$ac_ext <<_ACEOF ! #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ ! ! /* Override any gcc2 internal prototype to avoid an error. */ ! #ifdef __cplusplus ! extern "C" ! #endif ! /* We use char because int might match the return type of a gcc2 ! builtin and then its argument prototype would still apply. */ ! char pcreposix_regcomp (); ! int ! main () ! { ! pcreposix_regcomp (); ! ; ! return 0; ! } ! _ACEOF ! rm -f conftest.$ac_objext conftest$ac_exeext ! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ! (eval $ac_link) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } && ! { ac_try='test -s conftest$ac_exeext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then ! ac_cv_lib_pcreposix_pcreposix_regcomp=yes ! else ! echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_pcreposix_pcreposix_regcomp=no ! fi ! rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ! LIBS=$ac_check_lib_save_LIBS ! fi ! echo "$as_me:$LINENO: result: $ac_cv_lib_pcreposix_pcreposix_regcomp" >&5 ! echo "${ECHO_T}$ac_cv_lib_pcreposix_pcreposix_regcomp" >&6 ! if test $ac_cv_lib_pcreposix_pcreposix_regcomp = yes; then ! have_pcreposix=yes else ! have_pcreposix=no ! fi ! if test $have_pcreposix = "yes"; then - cat >>confdefs.h <<\_ACEOF - #define HAVE_PCRE 1 - _ACEOF - PCRE_OBJS="" - LIBS="${LIBS} -lpcre -lpcreposix" - fi - fi # Check for zlib --- 3388,3460 ---- PCRE_OBJS="pcre/get.o pcre/study.o pcre/chartables.o pcre/pcre.o pcre/pcreposix.o" ! if test -z "$PCRE_CONFIG"; then ! # Extract the first word of "pcre-config", so it can be a program name with args. ! set dummy pcre-config; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 ! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ! if test "${ac_cv_path_PCRE_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ! case $PCRE_CONFIG in ! [\\/]* | ?:[\\/]*) ! ac_cv_path_PCRE_CONFIG="$PCRE_CONFIG" # Let the user override the test with a path. ! ;; ! *) ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_path_PCRE_CONFIG="$as_dir/$ac_word$ac_exec_ext" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done ! done ! test -z "$ac_cv_path_PCRE_CONFIG" && ac_cv_path_PCRE_CONFIG="no" ! ;; ! esac fi ! PCRE_CONFIG=$ac_cv_path_PCRE_CONFIG ! ! if test -n "$PCRE_CONFIG"; then ! echo "$as_me:$LINENO: result: $PCRE_CONFIG" >&5 ! echo "${ECHO_T}$PCRE_CONFIG" >&6 else ! echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 fi + fi ! if test $PCRE_CONFIG = "no"; then ! echo "*** pcre-config not found." ! echo "*** The pcre library will be linked statically." ! echo "$as_me:$LINENO: checking PCRE_CFLAGS" >&5 ! echo $ECHO_N "checking PCRE_CFLAGS... $ECHO_C" >&6 ! PCRE_CFLAGS="-Ipcre" ! echo "$as_me:$LINENO: result: $PCRE_CFLAGS" >&5 ! echo "${ECHO_T}$PCRE_CFLAGS" >&6 else ! echo "$as_me:$LINENO: checking PCRE_CFLAGS" >&5 ! echo $ECHO_N "checking PCRE_CFLAGS... $ECHO_C" >&6 ! PCRE_CFLAGS=`$PCRE_CONFIG --cflags-posix` ! echo "$as_me:$LINENO: result: $PCRE_CFLAGS" >&5 ! echo "${ECHO_T}$PCRE_CFLAGS" >&6 + echo "$as_me:$LINENO: checking PCRE_LIBS" >&5 + echo $ECHO_N "checking PCRE_LIBS... $ECHO_C" >&6 + PCRE_LIBS=`$PCRE_CONFIG --libs-posix` + echo "$as_me:$LINENO: result: $PCRE_LIBS" >&5 + echo "${ECHO_T}$PCRE_LIBS" >&6 ! PCRE_OBJS="" ! fi # Check for zlib *************** *** 5681,5684 **** --- 5615,5621 ---- s,@CPP@,$CPP,;t t s,@EGREP@,$EGREP,;t t + s,@PCRE_CONFIG@,$PCRE_CONFIG,;t t + s,@PCRE_CFLAGS@,$PCRE_CFLAGS,;t t + s,@PCRE_LIBS@,$PCRE_LIBS,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t *************** *** 6136,6139 **** --- 6073,6080 ---- + + + + echo "" echo ' _ __ ____ ' |
|
From: Joshua P. <jpr...@us...> - 2004-08-05 02:01:25
|
Update of /cvsroot/middle-man/middleman/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26192/include Modified Files: proto.h Log Message: 1. Revert yesterday's patch removing some local variables. Instead of removing, move them into a tighter scope. 2. Detect libpcre using pcre-config (similar to pkg-config). Index: proto.h =================================================================== RCS file: /cvsroot/middle-man/middleman/include/proto.h,v retrieving revision 1.193 retrieving revision 1.194 diff -C2 -d -r1.193 -r1.194 *** proto.h 2 Apr 2004 14:31:36 -0000 1.193 --- proto.h 5 Aug 2004 02:01:16 -0000 1.194 *************** *** 6,16 **** #include "../tinyxml/tinyxml.h" - #ifdef HAVE_PCRE #include <pcre.h> #include <pcreposix.h> - #else - #include "../pcre/pcre.h" - #include "../pcre/pcreposix.h" - #endif /* HAVE_PCRE */ #ifdef HAVE_SSL --- 6,11 ---- |
|
From: Joshua P. <jpr...@us...> - 2004-08-05 02:01:25
|
Update of /cvsroot/middle-man/middleman/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26192/src Modified Files: main.c Log Message: 1. Revert yesterday's patch removing some local variables. Instead of removing, move them into a tighter scope. 2. Detect libpcre using pcre-config (similar to pkg-config). Index: main.c =================================================================== RCS file: /cvsroot/middle-man/middleman/src/main.c,v retrieving revision 1.216 retrieving revision 1.217 diff -C2 -d -r1.216 -r1.217 *** main.c 4 Aug 2004 06:17:37 -0000 1.216 --- main.c 5 Aug 2004 02:01:16 -0000 1.217 *************** *** 431,439 **** SSL_thread_setup(); ! // XXX: a better random source is needed ! for (x = 0; x < sizeof(buf); x++) ! buf[x] = rand() % 255; ! RAND_seed(buf, sizeof(buf)); #endif --- 431,442 ---- SSL_thread_setup(); ! { ! // XXX: a better random source is needed ! char buf[1024]; ! for (int x = 0; x < sizeof(buf); x++) ! buf[x] = rand() % 255; ! RAND_seed(buf, sizeof(buf)); ! } #endif |
|
From: Joshua P. <jpr...@us...> - 2004-08-04 06:17:48
|
Update of /cvsroot/middle-man/middleman/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24311/src Modified Files: main.c stats.c Log Message: make gcc-3.4.1 happy Index: stats.c =================================================================== RCS file: /cvsroot/middle-man/middleman/src/stats.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** stats.c 11 Mar 2004 22:27:16 -0000 1.9 --- stats.c 4 Aug 2004 06:17:37 -0000 1.10 *************** *** 176,180 **** sc.name = stat; sc.type = type | StatCounter::CALLBACK; ! (void *)sc.value.callback = (void *)cb; counter_list.push_back(sc); --- 176,180 ---- sc.name = stat; sc.type = type | StatCounter::CALLBACK; ! sc.value.callback = (stat_callback_t)cb; counter_list.push_back(sc); *************** *** 194,198 **** sc.name = stat; sc.type = type | StatCounter::CALLBACK; ! (void *)sc.value.callback = (void *)cb; counter_list.push_back(sc); --- 194,198 ---- sc.name = stat; sc.type = type | StatCounter::CALLBACK; ! sc.value.callback = (stat_callback_t)cb; counter_list.push_back(sc); Index: main.c =================================================================== RCS file: /cvsroot/middle-man/middleman/src/main.c,v retrieving revision 1.215 retrieving revision 1.216 diff -C2 -d -r1.215 -r1.216 *** main.c 4 Aug 2004 06:05:58 -0000 1.215 --- main.c 4 Aug 2004 06:17:37 -0000 1.216 *************** *** 415,422 **** void config() { ! int i, x; time_t t, curtime = time(NULL); struct tm tt; - char buf[1024]; gmtime_r(&curtime, &tt); --- 415,421 ---- void config() { ! int i; time_t t, curtime = time(NULL); struct tm tt; gmtime_r(&curtime, &tt); |
|
From: Joshua P. <jpr...@us...> - 2004-08-04 06:17:48
|
Update of /cvsroot/middle-man/middleman/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24311/include Modified Files: types.h Log Message: make gcc-3.4.1 happy Index: types.h =================================================================== RCS file: /cvsroot/middle-man/middleman/include/types.h,v retrieving revision 1.170 retrieving revision 1.171 diff -C2 -d -r1.170 -r1.171 *** types.h 4 Aug 2004 06:05:58 -0000 1.170 --- types.h 4 Aug 2004 06:17:36 -0000 1.171 *************** *** 1153,1156 **** --- 1153,1158 ---- + typedef char *(*stat_callback_t)(); + class StatCounter { public: *************** *** 1165,1169 **** union { ! void *(*callback)(); unsigned int count; } value; --- 1167,1171 ---- union { ! stat_callback_t callback; unsigned int count; } value; |
|
From: Joshua P. <jpr...@us...> - 2004-08-04 06:06:07
|
Update of /cvsroot/middle-man/middleman/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22584/src Modified Files: access.c main.c network.c Log Message: see patch #997423 for detailed justification Index: network.c =================================================================== RCS file: /cvsroot/middle-man/middleman/src/network.c,v retrieving revision 1.98 retrieving revision 1.99 diff -C2 -d -r1.98 -r1.99 *** network.c 2 Apr 2004 10:03:05 -0000 1.98 --- network.c 4 Aug 2004 06:05:59 -0000 1.99 *************** *** 92,96 **** void connection_free(CONNECTION *connection) { connection->profiles.clear(); ! connection->oprofiles.clear(); FREE_AND_NULL(connection->ip); --- 92,96 ---- void connection_free(CONNECTION *connection) { connection->profiles.clear(); ! connection->access_profiles.clear(); FREE_AND_NULL(connection->ip); Index: main.c =================================================================== RCS file: /cvsroot/middle-man/middleman/src/main.c,v retrieving revision 1.214 retrieving revision 1.215 diff -C2 -d -r1.214 -r1.215 *** main.c 4 Aug 2004 01:59:42 -0000 1.214 --- main.c 4 Aug 2004 06:05:58 -0000 1.215 *************** *** 1260,1264 **** void profiles_reset(CONNECTION * connection) { ! connection->profiles = connection->oprofiles; } --- 1260,1264 ---- void profiles_reset(CONNECTION * connection) { ! connection->profiles = connection->access_profiles; } Index: access.c =================================================================== RCS file: /cvsroot/middle-man/middleman/src/access.c,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** access.c 11 Mar 2004 22:27:15 -0000 1.43 --- access.c 4 Aug 2004 06:05:58 -0000 1.44 *************** *** 163,169 **** connection->authenticate = TRUE; ! connection->oprofiles = al->profiles; ! connection->profiles = al->profiles; ! connection->access = al->access; } --- 163,167 ---- connection->authenticate = TRUE; ! connection->access_profiles = al->profiles; connection->access = al->access; } |
|
From: Joshua P. <jpr...@us...> - 2004-08-04 06:06:07
|
Update of /cvsroot/middle-man/middleman/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22584/include Modified Files: types.h Log Message: see patch #997423 for detailed justification Index: types.h =================================================================== RCS file: /cvsroot/middle-man/middleman/include/types.h,v retrieving revision 1.169 retrieving revision 1.170 diff -C2 -d -r1.169 -r1.170 *** types.h 2 Apr 2004 14:31:36 -0000 1.169 --- types.h 4 Aug 2004 06:05:58 -0000 1.170 *************** *** 407,411 **** int bypass; struct url_command_t **url_command; ! StringList profiles, oprofiles; CACHEMAP *cachemap; HEADER *header, *rheader; --- 407,411 ---- int bypass; struct url_command_t **url_command; ! StringList profiles, access_profiles; CACHEMAP *cachemap; HEADER *header, *rheader; |
|
From: Joshua P. <jpr...@us...> - 2004-08-04 06:03:19
|
Update of /cvsroot/middle-man/middleman/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22232 Modified Files: cache.c Log Message: fix silly typo (maybe a CVS hiccup) Index: cache.c =================================================================== RCS file: /cvsroot/middle-man/middleman/src/cache.c,v retrieving revision 1.138 retrieving revision 1.139 diff -C2 -d -r1.138 -r1.139 *** cache.c 4 Aug 2004 01:59:42 -0000 1.138 --- cache.c 4 Aug 2004 06:02:57 -0000 1.139 *************** *** 79,83 **** { hashsize = CACHEMAP_HASH_SIZE; ! maxmemsize = 0; mementries = 0; lastclean = 0; --- 79,83 ---- { hashsize = CACHEMAP_HASH_SIZE; ! memsize = 0; mementries = 0; lastclean = 0; |
|
From: Joshua P. <jpr...@us...> - 2004-08-04 01:59:50
|
Update of /cvsroot/middle-man/middleman/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25565/src Modified Files: cache.c main.c section.c Log Message: improve diagnostics Index: cache.c =================================================================== RCS file: /cvsroot/middle-man/middleman/src/cache.c,v retrieving revision 1.137 retrieving revision 1.138 diff -C2 -d -r1.137 -r1.138 *** cache.c 6 Jun 2004 21:58:11 -0000 1.137 --- cache.c 4 Aug 2004 01:59:42 -0000 1.138 *************** *** 686,691 **** journal_add(cachemap); ! } else cachemap->store = NULL; } --- 686,693 ---- journal_add(cachemap); ! } else { ! putlog(MMLOG_CACHE, "cache: failed to create %s", file); cachemap->store = NULL; + } } Index: section.c =================================================================== RCS file: /cvsroot/middle-man/middleman/src/section.c,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** section.c 20 Jun 2004 21:26:30 -0000 1.40 --- section.c 4 Aug 2004 01:59:42 -0000 1.41 *************** *** 873,877 **** bool loadOkay = doc.LoadFile(); if (!loadOkay) { ! putlog(MMLOG_ERROR, "Error when parsing section.xml: %s", doc.ErrorDesc()); exit(1); } --- 873,877 ---- bool loadOkay = doc.LoadFile(); if (!loadOkay) { ! putlog(MMLOG_ERROR, "Error parsing %s: %s", sectionfile, doc.ErrorDesc()); exit(1); } Index: main.c =================================================================== RCS file: /cvsroot/middle-man/middleman/src/main.c,v retrieving revision 1.213 retrieving revision 1.214 diff -C2 -d -r1.213 -r1.214 *** main.c 6 Jun 2004 21:58:11 -0000 1.213 --- main.c 4 Aug 2004 01:59:42 -0000 1.214 *************** *** 560,564 **** bool loadOkay = document->LoadFile(); ! ASSERT(loadOkay); SectionMap::const_iterator iter; --- 560,567 ---- bool loadOkay = document->LoadFile(); ! if (!loadOkay) { ! putlog(MMLOG_ERROR, "Error parsing %s: %s", file.c_str(), document->ErrorDesc()); ! exit(1); ! } SectionMap::const_iterator iter; |
|
From: Riadh E. <ria...@us...> - 2004-07-10 10:27:09
|
Update of /cvsroot/middle-man/middleman/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28559/doc Modified Files: manual.xml Log Message: - updated the documentation about the installation procedure. Index: manual.xml =================================================================== RCS file: /cvsroot/middle-man/middleman/doc/manual.xml,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** manual.xml 5 Jul 2004 21:21:43 -0000 1.26 --- manual.xml 10 Jul 2004 10:27:00 -0000 1.27 *************** *** 41,49 **** <chapter> ! <title>Installation</title> ! <para>Installing Middleman should be straightforward. After ! extracting the archive type the following commands: ! "./configure && make", ! if you're using a BSD operating system you will need to use "gmake" rather than make, if that's unavailable as a last resort you can use BSD's make, then enter the "gcc -o mman *.o -pthread -lz" --- 41,61 ---- <chapter> ! <title>Installation</title> ! <para>Installing Middleman should be straightforward. After ! extracting the archive type the following commands: ! </para> ! <screen> ! $ ./configure ! $ make ! $ make install ! </screen> ! <para> ! This will install the middleman files in the /opt/middleman directory by ! default. If you want to install middleman into another directory, use the ! --prefix option with configure "./configure --prefix=/elsewhere" ! </para> ! ! <para> ! If you're using a BSD operating system you will need to use "gmake" rather than make, if that's unavailable as a last resort you can use BSD's make, then enter the "gcc -o mman *.o -pthread -lz" *************** *** 52,59 **** a complete list.</para> <para>If you wish to have the proxy server loaded ! at boot time, there is a script in the "scripts" directory ! called mman.init to assist you with that, simply edit the paths at ! the top then copy it to the "/etc/rc.#" directory, where # is your current runlevel (if you're unsure what it is, use the "runlevel" command). You may need to rename the script, if --- 64,76 ---- a complete list.</para> + <para> + To run middleman, we recommend that you use the starting script called + mman.init. It is installed in the prefix directory, which is /opt/middleman + by default. So simply type "/opt/middleman/mman.init start" to start + Middleman and "/opt/middleman/mman.init stop" to stop it. + </para> + <para>If you wish to have the proxy server loaded ! at boot time, then copy mman.init it to the "/etc/rc.#" directory, where # is your current runlevel (if you're unsure what it is, use the "runlevel" command). You may need to rename the script, if *************** *** 63,69 **** program's name.</para> ! <para>There are several command line options you may use when starting the proxy server; at the very least ! you will need the -c option followed by the path to the config.xml file, and the -s option followed by the ! path to the section.xml file. The -p option can be used to have middleman check (and create) a file containing the PID of the proxy server, this can be used to prevent multiple instances of the proxy server from running concurrently. The --- 80,91 ---- program's name.</para> ! <para>If you want to start the proxy by hand in order to ! customize it for your needs, use the mman binary in the install directory. ! There are several command line options you may ! use when starting the proxy this way; at the very least ! you will need the -c option followed by the path to ! the config.xml file, and the -s option followed by the ! path to the section.xml file. The -p option can be ! used to have middleman check (and create) a file containing the PID of the proxy server, this can be used to prevent multiple instances of the proxy server from running concurrently. The |
|
From: Riadh E. <ria...@us...> - 2004-07-10 10:27:08
|
Update of /cvsroot/middle-man/middleman In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28559 Modified Files: CHANGELOG Log Message: - updated the documentation about the installation procedure. Index: CHANGELOG =================================================================== RCS file: /cvsroot/middle-man/middleman/CHANGELOG,v retrieving revision 1.165 retrieving revision 1.166 diff -C2 -d -r1.165 -r1.166 *** CHANGELOG 5 Jul 2004 21:21:43 -0000 1.165 --- CHANGELOG 10 Jul 2004 10:27:00 -0000 1.166 *************** *** 25,28 **** --- 25,29 ---- - fixed a bug when sending a body that was originally received in chunks and buffered and processed, added test scenario III - changed the default install dir to /opt/middleman, with all the proxy files on it. config.xml and mman.init are now generated by the configure script. + - updated the documentation about the installation procedure. 2.0.1: |
|
From: Riadh E. <ria...@us...> - 2004-07-05 21:21:53
|
Update of /cvsroot/middle-man/middleman/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7464/src Modified Files: misc.c Log Message: - changed the default install dir to /opt/middleman, with all the proxy files on it. config.xml and mman.init are now generated by the configure script. Index: misc.c =================================================================== RCS file: /cvsroot/middle-man/middleman/src/misc.c,v retrieving revision 1.115 retrieving revision 1.116 diff -C2 -d -r1.115 -r1.116 *** misc.c 2 Apr 2004 10:03:05 -0000 1.115 --- misc.c 5 Jul 2004 21:21:44 -0000 1.116 *************** *** 179,183 **** case 401: case 407: ! return "Authenticaton required"; case 500: return "Internal Error"; --- 179,183 ---- case 401: case 407: ! return "Authentication required"; case 500: return "Internal Error"; |