[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog configure.ac doc/C/usermanual/u...
From: |
Benjamin Wolsey |
Subject: |
[Gnash-commit] gnash ChangeLog configure.ac doc/C/usermanual/u... |
Date: |
Fri, 28 Sep 2007 09:28:59 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Benjamin Wolsey <bwy> 07/09/28 09:28:59
Modified files:
. : ChangeLog configure.ac
doc/C/usermanual/usage: gnashrc.xml
testsuite/libbase: TCXXRc.cpp
Added files:
testsuite/libbase: gnashrc-local.in
Log message:
* configure.ac, testsuite/libbase/TCXXRc.cpp, gnashrc-local.in:
add
second rc file and test for append blacklist.
* docs: update user manual with black- and whitelist
information.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4459&r2=1.4460
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.424&r2=1.425
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/usermanual/usage/gnashrc.xml?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/TCXXRc.cpp?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/gnashrc-local.in?cvsroot=gnash&rev=1.1
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4459
retrieving revision 1.4460
diff -u -b -r1.4459 -r1.4460
--- ChangeLog 28 Sep 2007 08:46:48 -0000 1.4459
+++ ChangeLog 28 Sep 2007 09:28:58 -0000 1.4460
@@ -1,5 +1,11 @@
2007-09-27 Benjamin Wolsey <address@hidden>
+ * configure.ac, testsuite/libbase/TCXXRc.cpp, gnashrc-local.in: add
+ second rc file and test for append blacklist.
+ * docs: update user manual with black- and whitelist information.
+
+2007-09-27 Benjamin Wolsey <address@hidden>
+
* libbase/rc.cpp: for whitelists and blacklists, 'set' overrides
lists from previous files, 'append' adds to previous files.
* testsuite/libbase/gnashrc.in: update tests, replace colons (old
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.424
retrieving revision 1.425
diff -u -b -r1.424 -r1.425
--- configure.ac 27 Sep 2007 23:59:50 -0000 1.424
+++ configure.ac 28 Sep 2007 09:28:59 -0000 1.425
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.424 2007/09/27 23:59:50 tgc Exp $
+dnl $Id: configure.ac,v 1.425 2007/09/28 09:28:59 bwy Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -1444,6 +1444,7 @@
dnl AC_CONFIG_LINKS(doc/C/images)
AC_CONFIG_LINKS(testsuite/libbase/gnashrc:testsuite/libbase/gnashrc.in)
+AC_CONFIG_LINKS(testsuite/libbase/gnashrc-local:testsuite/libbase/gnashrc-local.in)
AC_OUTPUT(Makefile
libmedia/Makefile
Index: doc/C/usermanual/usage/gnashrc.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/usermanual/usage/gnashrc.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- doc/C/usermanual/usage/gnashrc.xml 25 Sep 2007 14:20:47 -0000 1.11
+++ doc/C/usermanual/usage/gnashrc.xml 28 Sep 2007 09:28:59 -0000 1.12
@@ -10,6 +10,11 @@
</para>
<para>
+Each line must begin with an action: either <emphasis>set</emphasis> or, in
the case of lists, also
+<emphasis>append</emphasis>.
+</para>
+
+<para>
The values in this configuration file apply only to an individual user, and
become the default settings of the standalone player and the plugin. Note that
any command line options take precedence over <filename>.gnashrc</filename>
settings.
</para>
@@ -57,7 +62,11 @@
<entry>This is a list of hostnames, separated by spaces. The hostname must be
given
without a protocol (http://, https://). If this list is populated,
&app; will only load external Flash movies from the specified
hosts. The
- whitelist takes precedence over the blacklist.</entry>
+ whitelist takes precedence over the blacklist. Because several
files can
+ be parsed in succession, each file can override or add to
+ lists in other files. Use <emphasis>set</emphasis> to override
+ all other lists or <emphasis>append</emphasis> to add your
blacklisted
+ hosts to lists in previously parsed files.</entry>
</row>
<row>
<entry>blacklist</entry>
@@ -66,7 +75,11 @@
without a protocol (http://, https://).
External flash movies from these
domains are never allowed to load. If whitelist is present
- and not empty, blacklist is not used.</entry>
+ and not empty, blacklist is not used. Because several files can
+ be parsed in succession, each file can override or add to
+ lists in other files. Use <emphasis>set</emphasis> to override
+ all other lists or <emphasis>append</emphasis> to add your
blacklisted
+ hosts to lists in previously parsed files.</entry>
</row>
<row>
<entry>delay</entry>
Index: testsuite/libbase/TCXXRc.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libbase/TCXXRc.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- testsuite/libbase/TCXXRc.cpp 25 Sep 2007 14:17:21 -0000 1.17
+++ testsuite/libbase/TCXXRc.cpp 28 Sep 2007 09:28:59 -0000 1.18
@@ -208,5 +208,25 @@
} else {
runtest.fail ("rc.getBlackList() doesn't have elements");
}
+
+ // Parse a second file
+ if (rc.parseFile("gnashrc-local")) {
+
+ // Test whether blacklist in gnashrc-local is appended
+ std::vector<std::string> blacklist = rc.getBlackList();
+ if (blacklist.size()) {
+ if ((blacklist[2] == "www.gnashdev.org")
+ && (blacklist[3] == "www.wikipedia.de")) {
+ runtest.pass ("rc.getBlackList() - append");
+ } else {
+ runtest.fail ("rc.getBlackList() - append");
+ }
+ runtest.pass ("rc.getBlackList() has elements after append");
+ } else {
+ runtest.fail ("rc.getBlackList() doesn't have elements after
append");
+ }
+
+ }
+
}
Index: testsuite/libbase/gnashrc-local.in
===================================================================
RCS file: testsuite/libbase/gnashrc-local.in
diff -N testsuite/libbase/gnashrc-local.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ testsuite/libbase/gnashrc-local.in 28 Sep 2007 09:28:59 -0000 1.1
@@ -0,0 +1,3 @@
+# Don't access content from these sites
+# Test for append to list
+append blacklist www.gnashdev.org www.wikipedia.de
- [Gnash-commit] gnash ChangeLog configure.ac doc/C/usermanual/u...,
Benjamin Wolsey <=