Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The patches for 3.0.3pre1.
[rsync/rsync-patches.git]
/
openssl-support.diff
diff --git
a/openssl-support.diff
b/openssl-support.diff
index
51543c3
..
ed673be
100644
(file)
--- a/
openssl-support.diff
+++ b/
openssl-support.diff
@@
-59,8
+59,8
@@
diff --git a/cleanup.c b/cleanup.c
+#endif
extern int keep_partial;
extern int got_xfer_error;
+#endif
extern int keep_partial;
extern int got_xfer_error;
- extern
char *partial_dir
;
-@@ -12
1,6 +124
,14 @@ NORETURN void _exit_cleanup(int code, const char *file, int line)
+ extern
int progress_is_active
;
+@@ -12
5,6 +128
,14 @@ NORETURN void _exit_cleanup(int code, const char *file, int line)
code, file, line);
}
code, file, line);
}
@@
-88,7
+88,7
@@
diff --git a/clientserver.c b/clientserver.c
extern int rsync_port;
extern int protect_args;
extern int ignore_errors;
extern int rsync_port;
extern int protect_args;
extern int ignore_errors;
-@@ -12
8,8 +131
,18 @@ int start_socket_client(char *host, int remote_argc, char *remote_argv[],
+@@ -12
6,8 +129
,18 @@ int start_socket_client(char *host, int remote_argc, char *remote_argv[],
#endif
ret = start_inband_exchange(fd, fd, user, remote_argc, remote_argv);
#endif
ret = start_inband_exchange(fd, fd, user, remote_argc, remote_argv);
@@
-108,7
+108,7
@@
diff --git a/clientserver.c b/clientserver.c
}
static int exchange_protocols(int f_in, int f_out, char *buf, size_t bufsiz, int am_client)
}
static int exchange_protocols(int f_in, int f_out, char *buf, size_t bufsiz, int am_client)
-@@ -27
2,6 +285
,32 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char
+@@ -27
0,6 +283
,32 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char
if (verbose > 1)
print_child_argv("sending daemon args:", sargs);
if (verbose > 1)
print_child_argv("sending daemon args:", sargs);
@@
-141,7
+141,7
@@
diff --git a/clientserver.c b/clientserver.c
io_printf(f_out, "%.*s\n", modlen, modname);
/* Old servers may just drop the connection here,
io_printf(f_out, "%.*s\n", modlen, modname);
/* Old servers may just drop the connection here,
-@@ -29
7,6 +336
,10 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char
+@@ -29
5,6 +334
,10 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char
* server to terminate the listing of modules.
* We don't want to go on and transfer
* anything; just exit. */
* server to terminate the listing of modules.
* We don't want to go on and transfer
* anything; just exit. */
@@
-152,7
+152,7
@@
diff --git a/clientserver.c b/clientserver.c
exit(0);
}
exit(0);
}
-@@ -30
4,6 +347
,10 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char
+@@ -30
2,6 +345
,10 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char
rprintf(FERROR, "%s\n", line);
/* This is always fatal; the server will now
* close the socket. */
rprintf(FERROR, "%s\n", line);
/* This is always fatal; the server will now
* close the socket. */
@@
-163,7
+163,7
@@
diff --git a/clientserver.c b/clientserver.c
return -1;
}
return -1;
}
-@@ -9
41,6 +988
,9 @@ int start_daemon(int f_in, int f_out)
+@@ -9
35,6 +982
,9 @@ int start_daemon(int f_in, int f_out)
if (exchange_protocols(f_in, f_out, line, sizeof line, 0) < 0)
return -1;
if (exchange_protocols(f_in, f_out, line, sizeof line, 0) < 0)
return -1;
@@
-173,7
+173,7
@@
diff --git a/clientserver.c b/clientserver.c
line[0] = 0;
if (!read_line_old(f_in, line, sizeof line))
return -1;
line[0] = 0;
if (!read_line_old(f_in, line, sizeof line))
return -1;
-@@ -9
52,6 +1002
,20 @@ int start_daemon(int f_in, int f_out)
+@@ -9
46,6 +996
,20 @@ int start_daemon(int f_in, int f_out)
return -1;
}
return -1;
}