|
Config
diff -Nur webCDwriter-2.6.5/CDWserver/HTTPServer.cpp webCDwriter-2.6.5c/CDWserver/HTTPServer.cpp
--- webCDwriter-2.6.5/CDWserver/HTTPServer.cpp 2004-02-11 12:04:57.000000000 +0100
+++ webCDwriter-2.6.5c/CDWserver/HTTPServer.cpp 2004-02-16 20:59:57.000000000 +0100
@@ -127,7 +127,10 @@
File file = new File(config.getHttpDir(),
"/webCDcreator/4pluginRSA/webCDcreator.jar");
String str = "/webCDcreator/4pluginRSA/version-";
- str = str + Version.version;
+ String ver = Version.version;
+ if (ver.length() == 3 + 2 + 1)
+ ver = ver.substring(0, 3 + 2);
+ str = str + ver;
File version = new File(config.getHttpDir(), str);
if (!file.exists() || !version.exists())
request.uri = "/webCDcreator/4pluginRSA/info.html";
@@ -198,23 +201,24 @@
try {
String str = new String(sb);
config.updateEditor(str);
- String passwdKey = PASSWORD;
- String password = config.getEditorValue(passwdKey);
- if (request.uri.equals("/config/support.html")) {
+ isAdmin = true;
+ if (request.uri.indexOf("/config/") >= 0
+ && request.uri.indexOf("/support.html") >= 0)
config.resetWarning();
- isAdmin = true;
- }
else {
+ String passwdKey = PASSWORD;
+ String password = config.getEditorValue(passwdKey);
Server::activateConfig();
config.setEditor(PASSWORD, password);
}
}
catch (Exception *e) {
- log.put(5, S.e + e->toString());
- if (e->toString().indexOf("Invalid password") >= 0
- && request.uri.equals("/config/support.html"))
+ log.put(5, S.e
+ + "HTTPServer::run(): " + e->toString());
+ if (request.uri.indexOf("/support.html") >= 0) {
request.uri = "/support.html";
isConfig = true;
+ }
delete e;
}
diff -Nur webCDwriter-2.6.5/CDWserver/Process.cpp webCDwriter-2.6.5c/CDWserver/Process.cpp
--- webCDwriter-2.6.5/CDWserver/Process.cpp 2004-02-06 00:00:24.000000000 +0100
+++ webCDwriter-2.6.5c/CDWserver/Process.cpp 2004-02-16 12:42:20.000000000 +0100
@@ -228,9 +228,10 @@
}
void Process::show() {
- log.putv("Process: <%s>", args[0]);
+ log.put(4, S.e + "Process: \"" + args[0] + "\"");
for (int i = 1; i < argsNum; i++)
- log.putv("%8d: <%s>", i, args[i]);
+ log.put(4, S.e + " " + (i < 10? " ": "") + i
+ + ": \"" + args[i] + "\"");
}
/**
diff -Nur webCDwriter-2.6.5/CDWserver/Server.cpp webCDwriter-2.6.5c/CDWserver/Server.cpp
--- webCDwriter-2.6.5/CDWserver/Server.cpp 2004-02-11 19:03:06.000000000 +0100
+++ webCDwriter-2.6.5c/CDWserver/Server.cpp 2004-02-16 12:16:51.000000000 +0100
@@ -1938,8 +1938,10 @@
writers[i].thread = getpid();
writers[i].reservedUntil = 0;
writers[i].state = reserved;
- if (ID < 0)
+ if (ID < 0) {
readerNo = i;
+ writers[i].thread = -getpid();
+ }
}
}
diff -Nur webCDwriter-2.6.5/CDWserver/Version.h webCDwriter-2.6.5c/CDWserver/Version.h
--- webCDwriter-2.6.5/CDWserver/Version.h 2004-02-12 14:12:11.000000000 +0100
+++ webCDwriter-2.6.5c/CDWserver/Version.h 2004-02-20 20:20:44.000000000 +0100
@@ -31,7 +31,7 @@
projectHome[] = "http://JoergHaeger.de/webCDwriter/",
soxHome[] = "http://sox.sourceforge.net",
subTitle[] = "Network CD Writing",
- version[] = "2.6.5";
+ version[] = "2.6.5c";
class Version {
public:
diff -Nur webCDwriter-2.6.5/ChangeLog webCDwriter-2.6.5c/ChangeLog
--- webCDwriter-2.6.5/ChangeLog 2004-02-10 17:45:51.000000000 +0100
+++ webCDwriter-2.6.5c/ChangeLog 2004-02-12 14:23:09.000000000 +0100
@@ -31,6 +31,11 @@
- use all available writers to burn several copies of a project
+webCDcreator
+
+- local "Save project as..." and "Open project..."
+
+
rcdrecord
- copies=# option to burn several copies of a project
Binary files webCDwriter-2.6.5/MD5Verify/MD5Verify.jar and webCDwriter-2.6.5c/MD5Verify/MD5Verify.jar differ
diff -Nur webCDwriter-2.6.5/rcdrecord/Version.h webCDwriter-2.6.5c/rcdrecord/Version.h
--- webCDwriter-2.6.5/rcdrecord/Version.h 2004-02-12 14:12:11.000000000 +0100
+++ webCDwriter-2.6.5c/rcdrecord/Version.h 2004-02-20 20:20:44.000000000 +0100
@@ -7,4 +7,4 @@
projectHome[] = "http://wwwhomes.uni-bielefeld.de/"
"jhaeger/webCDwriter/",
subTitle[] = "Network CD Writing",
- version[] = "2.6.5";
+ version[] = "2.6.5c";
Binary files webCDwriter-2.6.5/webCDcreator/4plugin/webCDcreator.jar and webCDwriter-2.6.5c/webCDcreator/4plugin/webCDcreator.jar differ
diff -Nur webCDwriter-2.6.5/webCDcreator/Version.java webCDwriter-2.6.5c/webCDcreator/Version.java
--- webCDwriter-2.6.5/webCDcreator/Version.java 2004-02-12 14:12:11.000000000 +0100
+++ webCDwriter-2.6.5c/webCDcreator/Version.java 2004-02-20 20:20:44.000000000 +0100
@@ -17,7 +17,7 @@
product = "webCDcreator",
projectHome = "http://JoergHaeger.de/webCDwriter/",
subTitle = "Network CD/DVD Writing",
- version = "2.6.5";
+ version = "2.6.5c";
/**
* tags: bytesPerSecond, cellEditor, getURL(), ls -l,
diff -Nur webCDwriter-2.6.5/webCDwriter.spec webCDwriter-2.6.5c/webCDwriter.spec
--- webCDwriter-2.6.5/webCDwriter.spec 2004-02-12 14:12:11.000000000 +0100
+++ webCDwriter-2.6.5c/webCDwriter.spec 2004-02-20 20:20:44.000000000 +0100
@@ -3,7 +3,7 @@
#
%define name webCDwriter
-%define version 2.6.5
+%define version 2.6.5c
%define release 1
%if %(test -e /etc/mandrake-release && echo 1 || echo 0)
|