> � ����� �������� diff �� 1.5.22 ������� � cvs? > � �� ����������� ����... > --
� �������� ��������� ���� � ����� Oops http://zipper.paco.net/~igor/oops/diff_from_1.5.22.patch ������� ������: [...] Hmm... The next patch looks like a new-style context diff to me... The text leading up to this was: -------------------------- |Index: src/oops.c |=================================================================== |RCS file: /usr/local/cvs/oops/src/oops.c,v |retrieving revision 1.74 |retrieving revision 1.77 |diff -c -r1.74 -r1.77 |*** oops.c 2002/01/23 19:29:02 1.74 |--- oops.c 2002/07/30 08:05:56 1.77 -------------------------- Patching file src/oops.c using Plan A... Hunk #1 succeeded at 68. Hunk #2 succeeded at 157. Hunk #3 failed at 365. Hunk #4 succeeded at 695. Hunk #5 succeeded at 705. 1 out of 5 hunks failed--saving rejects to src/oops.c.rej [...] Hmm... The next patch looks like a new-style context diff to me... The text leading up to this was: -------------------------- |Index: src/ssl.c |=================================================================== |RCS file: /usr/local/cvs/oops/src/ssl.c,v |retrieving revision 1.14 |retrieving revision 1.16 |diff -c -r1.14 -r1.16 |*** ssl.c 2001/05/07 15:11:59 1.14 |--- ssl.c 2002/03/01 09:46:28 1.16 -------------------------- Patching file src/ssl.c using Plan A... Ignoring previously applied (or reversed) patch. Hunk #1 ignored at 35. Hunk #2 ignored at 45. 2 out of 2 hunks ignored--saving rejects to src/ssl.c.rej [...] Hmm... The next patch looks like a new-style context diff to me... The text leading up to this was: -------------------------- |Index: src/modules/passwd_sql.c |=================================================================== |RCS file: /usr/local/cvs/oops/src/modules/passwd_sql.c,v |retrieving revision 1.15 |retrieving revision 1.17 |diff -c -r1.15 -r1.17 |*** passwd_sql.c 2002/01/23 19:29:02 1.15 |--- passwd_sql.c 2002/03/09 17:46:54 1.17 -------------------------- Patching file src/modules/passwd_sql.c using Plan A... Hunk #1 succeeded at 118. Hunk #2 succeeded at 128. Hunk #3 failed at 283. 1 out of 3 hunks failed--saving rejects to src/modules/passwd_sql.c.rej done [...] ��� ��������������� .rej: #oops.c.rej *************** *** 363,369 **** { printf("usage: oops [-{C|c} config_filename] [-v] [-V] [-w num] [-W num]\n"); printf(" [-x acdfhinsACDFHINS] [-{Z|z}]\n"); ! printf("-C|c filename - path to config file.\n"); printf("-d detaches from the terminal, so runs as daemon.\n"); printf("-v - verbose startup.\n"); printf("-V - show version info.\n"); --- 365,371 ---- { printf("usage: oops [-{C|c} config_filename] [-v] [-V] [-w num] [-W num]\n"); printf(" [-x acdfhinsACDFHINS] [-{Z|z}]\n"); ! printf("-C|c filename - path to config file (-C - config test).\n"); printf("-d detaches from the terminal, so runs as daemon.\n"); printf("-v - verbose startup.\n"); printf("-V - show version info.\n"); #ssl.c.rej *************** *** 35,41 **** my_xlog(OOPS_LOG_DBG, "send_ssl(): Connecting %s:%d\n", rq->url.host, rq->url.port); gettimeofday(&start_tv, NULL); ! if ( parent_port ) { server_so = parent_connect_silent(so, parent_host, parent_port, rq); } else { server_so = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); --- 35,41 ---- my_xlog(OOPS_LOG_DBG, "send_ssl(): Connecting %s:%d\n", rq->url.host, rq->url.port); gettimeofday(&start_tv, NULL); ! if ( parent_port && !is_local_dom(rq->url.host) ) { server_so = parent_connect_silent(so, parent_host, parent_port, rq); } else { server_so = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); *************** *** 45,54 **** ERR_INTERNAL, rq); goto done; } ! if ( parent_port ) { parent_req = malloc(64 + strlen(url->host)); if ( parent_req ) { ! sprintf(parent_req, "CONNECT %s:%d HTTP/1.0\r\n\r\n", url->host, url->port); r = writet(server_so, parent_req, strlen(parent_req), READ_ANSW_TIMEOUT); free(parent_req); if ( r < 0 ) goto done; --- 45,61 ---- ERR_INTERNAL, rq); goto done; } ! if ( parent_port && !is_local_dom(rq->url.host)) { parent_req = malloc(64 + strlen(url->host)); if ( parent_req ) { ! char *fav = NULL; ! ! if ( parent_auth && ! (fav = format_av_pair("Proxy-Authorization: Basic", rq->peer_auth))) { ! sprintf(parent_req, "CONNECT %s:%d HTTP/1.0\r\n%s\r\n", url->host, url->port,fav); ! xfree(fav); ! } else ! sprintf(parent_req, "CONNECT %s:%d HTTP/1.0\r\n\r\n", url->host, url->port); r = writet(server_so, parent_req, strlen(parent_req), READ_ANSW_TIMEOUT); free(parent_req); if ( r < 0 ) goto done; #modules/passwd_sql.c.rej *************** *** 283,289 **** } MODULE_STATIC ! int mod_config(char *config, int) { char *p = config; --- 283,289 ---- } MODULE_STATIC ! int mod_config(char *config, int i) { char *p = config; # HTH, ����� > > Rgdz, /"\ ASCII RIBBON CAMPAIGN > Sergey Osokin aka oZZ, \ / AGAINST HTML MAIL > http://ozz.pp.ru/ X AND NEWS > / \ > ===================================================================== > If you would like to unsubscribe from this list send message to > [EMAIL PROTECTED] with "unsubscribe oops" in message body. > Archive is accessible on http://lists.paco.net/oops-rus/ > ===================================================================== If you would like to unsubscribe from this list send message to [EMAIL PROTECTED] with "unsubscribe oops" in message body. Archive is accessible on http://lists.paco.net/oops-rus/
