CVSROOT: /sources/gnash
Module name: gnash
Changes by: Benjamin Wolsey <bwy> 07/10/03 14:15:23
Modified files:
. : ChangeLog
doc/C/usermanual/usage: gnashrc.xml
gui : gnash.cpp gtk.cpp
libbase : rc.cpp rc.h
testsuite/libbase: TCXXRc.cpp gnashrc.in
Log message:
* libbase/rc.{cpp,h}: reference instead of copy for expandpath
* testsuite/libbase/TCXXRc.cpp, gnashrc.in: tests for
insecureSSL
* docs: add insecureSSL and minor cleanups to gnashrc.xml
* gui/gnash.cpp, gui/gtk.cpp: comment out broken / disabled
movie
controls until they work.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4509&r2=1.4510
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/usage/gnashrc.xml?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&r1=1.94&r2=1.95
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.120&r2=1.121
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.cpp?cvsroot=gnash&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.h?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/TCXXRc.cpp?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/gnashrc.in?cvsroot=gnash&r1=1.9&r2=1.10
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4509
retrieving revision 1.4510
diff -u -b -r1.4509 -r1.4510
--- ChangeLog 3 Oct 2007 13:10:17 -0000 1.4509
+++ ChangeLog 3 Oct 2007 14:15:21 -0000 1.4510
@@ -1,3 +1,11 @@
+2007-10-03 Benjamin Wolsey <[EMAIL PROTECTED]>
+
+ * libbase/rc.{cpp,h}: reference instead of copy for expandpath
+ * testsuite/libbase/TCXXRc.cpp, gnashrc.in: tests for insecureSSL
+ * docs: add insecureSSL and minor cleanups to gnashrc.xml
+ * gui/gnash.cpp, gui/gtk.cpp: comment out broken / disabled movie
+ controls until they work.
+
2007-10-03 Sandro Santilli <[EMAIL PROTECTED]>
* server/as_value.{cpp,h}: changed to_string and to_string_versioned
Index: doc/C/usermanual/usage/gnashrc.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/usage/gnashrc.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- doc/C/usermanual/usage/gnashrc.xml 28 Sep 2007 15:44:03 -0000 1.13
+++ doc/C/usermanual/usage/gnashrc.xml 3 Oct 2007 14:15:22 -0000 1.14
@@ -125,14 +125,14 @@
<entry>on/off</entry>
<entry>This value can be set to either <emphasis>on</emphasis> or
<emphasis>off</emphasis>, and controls whether a debug log
- is always written by Gnash, or not at all.</entry>
+ is always written by &app;, or not at all.</entry>
</row>
<row>
<entry>sound</entry>
<entry>on/off</entry>
<entry>This value can be set to either <emphasis>on</emphasis> or
<emphasis>off</emphasis>, and controls the sound of the
- standalone player. By default Gnash enables playing the
+ standalone player. By default &app; enables playing the
sound in any Flash movie.</entry>
</row>
<row>
@@ -141,7 +141,7 @@
<entry>This value can be set to either <emphasis>on</emphasis> or
<emphasis>off</emphasis>, and controls the sound of the
player when running as a browser plugin. By default, sound
- is enabled when using Gnash as a browser plugin.</entry>
+ is enabled when using &app; as a browser plugin.</entry>
</row>
<row>
<entry>EnableExtensions</entry>
@@ -172,6 +172,15 @@
passed w/out anything was received.
</entry>
</row>
+<row>
+<entry>insecureSSL</entry>
+<entry>on/off</entry>
+<entry>If set to <emphasis>on</emphasis>, no verification of SSL connections
+is performed. This means that, although the connection is encrypted, the server
+certificate could be invalid, may not belong to the host, or both. Equivalent
+to curl --insecure. By default, this option is <emphasis>off</emphasis> and
+connections will fail when a host cannot be verified.</entry>
+</row>
</tbody>
</tgroup>
</table>
@@ -198,6 +207,10 @@
# movies *only* from the specified hosts.
#set whitelist www.doonesbury.com www.cnn.com www.9news.com
+ # Disable whitelists set in any other gnashrc files, because
+ # these could override our blacklist.
+ set whitelist off
+
# Don't access content from these sites
set blacklist www.doubleclick.com mochibot.com
@@ -225,6 +238,9 @@
# Enable or Disable sound for the standalone player
set pluginsound on
+ # Make sure SSL connections are always verified
+ set insecureSSL off
+
</programlisting>
Index: gui/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- gui/gnash.cpp 27 Sep 2007 12:37:59 -0000 1.94
+++ gui/gnash.cpp 3 Oct 2007 14:15:22 -0000 1.95
@@ -141,8 +141,12 @@
" CTRL-Q, CTRL-W Quit/Exit\n"
" CTRL-P Toggle Pause\n"
" CTRL-R Restart the movie\n"
+
+#if 0 // Currently disabled
" CTRL-[ or kp- Step back one frame\n"
" CTRL-] or kp+ Step forward one frame\n"
+#endif
+
" CTRL-L Force immediate redraw\n"
/*
" CTRL-B Toggle background color\n" // No code to make this
work or indication
Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- gui/gtk.cpp 28 Sep 2007 03:03:53 -0000 1.120
+++ gui/gtk.cpp 3 Oct 2007 14:15:22 -0000 1.121
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: gtk.cpp,v 1.120 2007/09/28 03:03:53 rsavoye Exp $ */
+/* $Id: gtk.cpp,v 1.121 2007/10/03 14:15:22 bwy Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1745,6 +1745,8 @@
g_signal_connect ((gpointer) menuitem_restart, "activate",
G_CALLBACK (&menuitem_restart_callback), this);
+#if 0 // Presently disabled
+
GtkWidget *separator1 = gtk_separator_menu_item_new ();
gtk_widget_show (separator1);
gtk_container_add (GTK_CONTAINER (menu), separator1);
@@ -1794,6 +1796,8 @@
gtk_menu_append(menu, GTK_WIDGET(menuitem_jump_backward));
gtk_widget_show(GTK_WIDGET(menuitem_jump_backward));
+#endif
+
}
bool
Index: libbase/rc.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- libbase/rc.cpp 30 Sep 2007 18:51:27 -0000 1.39
+++ libbase/rc.cpp 3 Oct 2007 14:15:23 -0000 1.40
@@ -237,7 +237,7 @@
}
string
-RcInitFile::expandPath (std::string _path)
+RcInitFile::expandPath (std::string& path)
{
@@ -249,13 +249,13 @@
//Don't build tilde expansion on systems without pwd.h
//Only if path starts with "~"
- if (_path.substr(0,1) == "~") {
+ if (path.substr(0,1) == "~") {
const char *home = getenv("HOME");
- if (_path.substr(1,1) == "/") {
+ if (path.substr(1,1) == "/") {
// Initial "~" followed by "/"
if (home) {
// if HOME set in env, replace ~ with HOME
- _path = _path.replace(0,1,home);
+ path = path.replace(0,1,home);
}
# ifdef HAVE_GETPWNAM
@@ -267,7 +267,7 @@
struct passwd *password = getpwuid(getuid());
const char *pwdhome = password->pw_dir;
if (home) {
- _path = _path.replace(0,1,pwdhome);
+ path = path.replace(0,1,pwdhome);
}
//If all that fails, leave path alone
}
@@ -277,12 +277,12 @@
else {
const char *userhome = NULL;
string::size_type first_slash =
- _path.find_first_of("/");
+ path.find_first_of("/");
string user;
if (first_slash != string::npos) {
// everything between initial ~ and /
- user = _path.substr(1, first_slash - 1 );
- } else user = _path.substr(1);
+ user = path.substr(1, first_slash - 1 );
+ } else user = path.substr(1);
//find user using pwd
struct passwd *password = getpwnam(user.c_str());
@@ -292,14 +292,14 @@
}
if (userhome) {
string foundhome(userhome);
- _path = _path.replace(0,first_slash,foundhome);
+ path = path.replace(0,first_slash,foundhome);
}
# endif
}
}
#endif
- return _path;
+ return path;
}
// Parse the config file and set the variables.
Index: libbase/rc.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- libbase/rc.h 30 Sep 2007 18:51:27 -0000 1.28
+++ libbase/rc.h 3 Oct 2007 14:15:23 -0000 1.29
@@ -163,7 +163,7 @@
/// The number of seconds of inactivity triggering download timeout
double _streamsTimeout;
- static std::string expandPath(std::string _path); //path string operations
+ static std::string expandPath(std::string& path); //path string operations
static bool extractSetting(bool *var, const char *pattern,
std::string &variable, std::string &value);
Index: testsuite/libbase/TCXXRc.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libbase/TCXXRc.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- testsuite/libbase/TCXXRc.cpp 28 Sep 2007 15:44:03 -0000 1.19
+++ testsuite/libbase/TCXXRc.cpp 3 Oct 2007 14:15:23 -0000 1.20
@@ -182,6 +182,12 @@
runtest.fail ("streamsTimeout");
}
+ if (rc.SSLInsecure()) {
+ runtest.pass ("insecureSSL");
+ } else {
+ runtest.fail ("insecureSSL");
+ }
+
std::vector<std::string> whitelist = rc.getWhiteList();
if (whitelist.size()) {
if ((whitelist[0] == "www.doonesbury.com")
Index: testsuite/libbase/gnashrc.in
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libbase/gnashrc.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- testsuite/libbase/gnashrc.in 28 Sep 2007 08:46:49 -0000 1.9
+++ testsuite/libbase/gnashrc.in 3 Oct 2007 14:15:23 -0000 1.10
@@ -46,6 +46,9 @@
# Start the gui in STOP mode
set startStopped on
+# Allow unverified SSL connections
+set insecureSSL on
+
# Timeout in seconds for stream download
# The download will timeout after the given seconds
# of inactivity. Every activity resets the timer
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
