diff options
| author | Andreas Brachold <vdr07@deltab.de> | 2009-11-15 16:48:26 +0000 |
|---|---|---|
| committer | Andreas Brachold <vdr07@deltab.de> | 2009-11-15 16:48:26 +0000 |
| commit | b3acde23784ba09f5575e2de00223b6ee15aaa18 (patch) | |
| tree | 4c416653fbe96d62e1f0f3cd2db275e0e291cdc8 /lib/XXV/OUTPUT | |
| parent | d48498579ceaa0ab4a9b4ae8f2a6a95b0ee89311 (diff) | |
| download | xxv-b3acde23784ba09f5575e2de00223b6ee15aaa18.tar.gz xxv-b3acde23784ba09f5575e2de00223b6ee15aaa18.tar.bz2 | |
* Fix: Avoid destroy muggle database connection on fork
* AUTOTIMER: adjust timer before assign new autotimer
* MUSIC: add option data=all:1 to deliver all tracks
* HTTP: allow skins with swf files
* CHANNELS: allow clist for guest users
* TIMERS: adjust inactive timer too
Diffstat (limited to 'lib/XXV/OUTPUT')
| -rw-r--r-- | lib/XXV/OUTPUT/Html.pm | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/XXV/OUTPUT/Html.pm b/lib/XXV/OUTPUT/Html.pm index 7ad6e64..0d3cfeb 100644 --- a/lib/XXV/OUTPUT/Html.pm +++ b/lib/XXV/OUTPUT/Html.pm @@ -194,6 +194,7 @@ sub parseTemplateFile { debug => 0, # Avoid losing encoding like utf8 verbose => $self->{debug}, user => $self->{USER}->{Name}, + sid => $self->{USER}->{sid}, charset => $self->{charset}, skin => $self->{SkinName}, # query the current locale @@ -747,6 +748,10 @@ sub _stream { } elsif ($child == 0) { $self->{dbh}->{InactiveDestroy} = 1; + my $modM = main::getModule('MUSIC'); + if($modM->{mdbh}) { + $modM->{mdbh}->{InactiveDestroy} = 1; + } eval { local $SIG{'__DIE__'}; @@ -825,6 +830,10 @@ sub proxy { } elsif ($child == 0) { $self->{dbh}->{InactiveDestroy} = 1; + my $modM = main::getModule('MUSIC'); + if($modM->{mdbh}) { + $modM->{mdbh}->{InactiveDestroy} = 1; + } eval { local $SIG{'__DIE__'}; lg(sprintf("Send request %s",$request)); |
