| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123 |
- diff -Naur DSS-4_1_3.src.orig/WebAdmin/WebAdminHtml/playlist-lib.pl DSS-4_1_3.src/WebAdmin/WebAdminHtml/playlist-lib.pl
- --- DSS-4_1_3.src.orig/WebAdmin/WebAdminHtml/playlist-lib.pl Sat Feb 22 00:42:27 2003
- +++ DSS-4_1_3.src/WebAdmin/WebAdminHtml/playlist-lib.pl Fri May 9 17:50:28 2003
- @@ -384,7 +384,7 @@
- $item =~ /(.+)[:]([0-9]+)$/;
- $movie = $1;
- $wt = $2;
- - if ($wt == "") {
- + if ($wt eq "") {
- $wt = 10;
- }
- $movie =~ s/\"/\"\"/g;
- @@ -669,7 +669,7 @@
- $item =~ /(.+)[:]([0-9]+)$/;
- $movie = $1;
- $wt = $2;
- - if ($wt == "") {
- + if ($wt eq "") {
- $wt = 10;
- }
- $htmlstr .= &playlistlib::EmitPLRemoveMovieTableRowHTML($movie, $wt, $label);
- @@ -769,7 +769,7 @@
- $item =~ /(.+)[:]([0-9]+)$/;
- $movie = $1;
- $wt = $2;
- - if ($wt == "") {
- + if ($wt eq "") {
- $wt = 10;
- }
- $htmlstr .= &playlistlib::EmitPLDetailTableRowHTML($movie, $wt, $i, $label);
- diff -Naur DSS-4_1_3.src.orig/qtaccess DSS-4_1_3.src/qtaccess
- --- DSS-4_1_3.src.orig/qtaccess Sat Feb 22 00:42:15 2003
- +++ DSS-4_1_3.src/qtaccess Mon Jun 2 17:28:44 2003
- @@ -1,9 +1,9 @@
- # qtaccess
- -# A sample access file for streaming
- -# server authorization
- +# A sample access file for streaming
- +# server authorization
- # ----------------------------------
- -# Note:
- -# For each keyword, the first sentence in the comment
- +# Note:
- +# For each keyword, the first sentence in the comment
- # explains the keyword, and the usage: line explains
- # how to use it. Anything not in angle brackets is a keyword
- # and keywords are case-sensitive.
- @@ -12,31 +12,29 @@
- # AuthScheme: The authentication scheme that will be used
- # usage: AuthScheme <scheme>
- # where scheme is either "basic" or "digest"
- -AuthScheme basic
- +AuthScheme digest
-
- # AuthName: The authentication realm that will be
- # presented to the client (for Basic Authentication only)
- # usage: AuthName <realm>
- # where realm can be a single word or a quoted multi-word string
- -AuthName "streaming server realm"
- +AuthName "Streaming Server"
-
- # AuthUserFile: The filename that contains the list of users
- -# for this access file
- +# for this access file
- # If not given, the default filename is /Library/QuickTimeStreaming/Config/qtusers for MacOSX
- -# If not given, the default filename is /etc/streaming/qtusers for POSIX
- +# If not given, the default filename is @l_prefix@/etc/dss/qtusers for POSIX
- # usage: AuthUserFile <user filename>
- -#AuthUserFile /etc/streaming/qtusers
- -AuthUserFile /Library/QuickTimeStreaming/Config/qtusers
- +AuthUserFile @l_prefix@/etc/dss/qtusers
-
- -# AuthGroupFile: The filename that contains the groups and the
- +# AuthGroupFile: The filename that contains the groups and the
- # users that belong to each group
- # If not given, the default filename is /Library/QuickTimeStreaming/Config/qtgroups for MacOSX
- -# If not given, the default filename is /etc/streaming/qtgroups for POSIX
- +# If not given, the default filename is @l_prefix@/etc/dss/qtgroups for POSIX
- # usage: AuthGroupFile <group filename>
- -#AuthGroupFile /etc/streaming/qtgroups
- -AuthGroupFile /Library/QuickTimeStreaming/Config/qtgroups
- +AuthGroupFile @l_prefix@/etc/dss/qtgroups
-
- -# require user: The names next to this specify which user
- +# require user: The names next to this specify which user
- # is allowed to access the media in this folder
- # below are two special cases:
- # require any-user => implies any user is allowed without
- @@ -44,24 +42,24 @@
- # require valid-user => implies any user that is
- # authenticated is allowed access
- # usage: require user <username1> <username2> ...
- -require user johndoe
- +require any-user
-
- # require group: The names of the groups that are allowed
- # access to the media in this folder
- # usage: require group <groupname1> <groupname2> ...
- -require group movie-watchers
-
- # <Limit READ/WRITE>: This directive is to specify access control
- # for READ and/or WRITE privileges. If not present, all access control
- # keywords apply to READ privileges only.
- -# <Limit WRITE> is used for WRITE privileges, and <Limit READ WRITE> for
- +# <Limit WRITE> is used for WRITE privileges, and <Limit READ WRITE> for
- # both. <Limit READ> can be omitted as the access keywords outside the
- # Limit directive
- # usage: <Limit [READ|WRITE] ..> ... </Limit>
- -<Limit WRITE>
- - AuthName "streaming server broadcaster realm"
- - AuthUserFile /Library/QuickTimeStreaming/Config/qtbroadcastusers
- - AuthGroupFile /Library/QuickTimeStreaming/Config/qtbroadcastgroups
- - require group broadcaster
- -</Limit>
- +
- +#<Limit WRITE>
- +# AuthName "Streaming Server Broadcaster"
- +# AuthUserFile @l_prefix@/etc/dss/qtbroadcastusers
- +# AuthGroupFile @l_prefix@/etc/dss/qtbroadcastgroups
- +# require group broadcaster
- +#</Limit>
-
|