Skip to content

Commit 589efcc

Browse files
brookgagnonbrookgagnon
committed
Merge remote-tracking branch 'origin/5.3-develop' into 5.3-develop
2 parents 1afbfe9 + d928abe commit 589efcc

File tree

119 files changed

+258
-2090
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+258
-2090
lines changed

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.3.5-20250906
1+
5.3.6-20250906

‎admin/index.php‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,7 @@
11
<?php
22

3-
/*
4-
Copyright 2012-2024 OpenBroadcaster, Inc.
5-
6-
This file is part of OpenBroadcaster Server.
7-
8-
OpenBroadcaster Server is free software: you can redistribute it and/or modify
9-
it under the terms of the GNU Affero General Public License as published by
10-
the Free Software Foundation, either version 3 of the License, or
11-
(at your option) any later version.
12-
13-
OpenBroadcaster Server is distributed in the hope that it will be useful,
14-
but WITHOUT ANY WARRANTY; without even the implied warranty of
15-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16-
GNU Affero General Public License for more details.
17-
18-
You should have received a copy of the GNU Affero General Public License
19-
along with OpenBroadcaster Server. If not, see <http://www.gnu.org/licenses/>.
20-
*/
3+
// Copyright 2012-2024 OpenBroadcaster, Inc.
4+
// SPDX-License-Identifier: AGPL-3.0-or-later
215

226
require_once __DIR__ . '/../config.php';
237

‎admin/run.php‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,7 @@
11
<?php
22

3-
/*
4-
Copyright 2012-2024 OpenBroadcaster, Inc.
5-
6-
This file is part of OpenBroadcaster Server.
7-
8-
OpenBroadcaster Server is free software: you can redistribute it and/or modify
9-
it under the terms of the GNU Affero General Public License as published by
10-
the Free Software Foundation, either version 3 of the License, or
11-
(at your option) any later version.
12-
13-
OpenBroadcaster Server is distributed in the hope that it will be useful,
14-
but WITHOUT ANY WARRANTY; without even the implied warranty of
15-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16-
GNU Affero General Public License for more details.
17-
18-
You should have received a copy of the GNU Affero General Public License
19-
along with OpenBroadcaster Server. If not, see <http://www.gnu.org/licenses/>.
20-
*/
3+
// Copyright 2012-2024 OpenBroadcaster, Inc.
4+
// SPDX-License-Identifier: AGPL-3.0-or-later
215

226
require_once __DIR__ . '/../vendor/autoload.php';
237
require_once __DIR__ . '/../config.php';

‎api.php‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,7 @@
11
<?php
22

3-
/*
4-
Copyright 2012-2024 OpenBroadcaster, Inc.
5-
6-
This file is part of OpenBroadcaster Server.
7-
8-
OpenBroadcaster Server is free software: you can redistribute it and/or modify
9-
it under the terms of the GNU Affero General Public License as published by
10-
the Free Software Foundation, either version 3 of the License, or
11-
(at your option) any later version.
12-
13-
OpenBroadcaster Server is distributed in the hope that it will be useful,
14-
but WITHOUT ANY WARRANTY; without even the implied warranty of
15-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16-
GNU Affero General Public License for more details.
17-
18-
You should have received a copy of the GNU Affero General Public License
19-
along with OpenBroadcaster Server. If not, see <http://www.gnu.org/licenses/>.
20-
*/
3+
// Copyright 2012-2025 OpenBroadcaster, Inc.
4+
// SPDX-License-Identifier: AGPL-3.0-or-later
215

226
require_once('components.php');
237

‎classes/core/obfcallbacks.php‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,7 @@
11
<?php
22

3-
/*
4-
Copyright 2012-2024 OpenBroadcaster, Inc.
5-
6-
This file is part of OpenBroadcaster Server.
7-
8-
OpenBroadcaster Server is free software: you can redistribute it and/or modify
9-
it under the terms of the GNU Affero General Public License as published by
10-
the Free Software Foundation, either version 3 of the License, or
11-
(at your option) any later version.
12-
13-
OpenBroadcaster Server is distributed in the hope that it will be useful,
14-
but WITHOUT ANY WARRANTY; without even the implied warranty of
15-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16-
GNU Affero General Public License for more details.
17-
18-
You should have received a copy of the GNU Affero General Public License
19-
along with OpenBroadcaster Server. If not, see <http://www.gnu.org/licenses/>.
20-
*/
3+
// Copyright 2012-2024 OpenBroadcaster, Inc.
4+
// SPDX-License-Identifier: AGPL-3.0-or-later
215

226
/**
237
* Manages callbacks. Returns an OBFCallbackReturn when firing, which is also

‎classes/core/obfcontroller.php‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,7 @@
11
<?php
22

3-
/*
4-
Copyright 2012-2024 OpenBroadcaster, Inc.
5-
6-
This file is part of OpenBroadcaster Server.
7-
8-
OpenBroadcaster Server is free software: you can redistribute it and/or modify
9-
it under the terms of the GNU Affero General Public License as published by
10-
the Free Software Foundation, either version 3 of the License, or
11-
(at your option) any later version.
12-
13-
OpenBroadcaster Server is distributed in the hope that it will be useful,
14-
but WITHOUT ANY WARRANTY; without even the implied warranty of
15-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16-
GNU Affero General Public License for more details.
17-
18-
You should have received a copy of the GNU Affero General Public License
19-
along with OpenBroadcaster Server. If not, see <http://www.gnu.org/licenses/>.
20-
*/
3+
// Copyright 2012-2024 OpenBroadcaster, Inc.
4+
// SPDX-License-Identifier: AGPL-3.0-or-later
215

226
/**
237
* Manages controllers. Makes frameworks available, adds associated controller

‎classes/core/obfdb.php‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,7 @@
11
<?php
22

3-
/*
4-
Copyright 2012-2024 OpenBroadcaster, Inc.
5-
6-
This file is part of OpenBroadcaster Server.
7-
8-
OpenBroadcaster Server is free software: you can redistribute it and/or modify
9-
it under the terms of the GNU Affero General Public License as published by
10-
the Free Software Foundation, either version 3 of the License, or
11-
(at your option) any later version.
12-
13-
OpenBroadcaster Server is distributed in the hope that it will be useful,
14-
but WITHOUT ANY WARRANTY; without even the implied warranty of
15-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16-
GNU Affero General Public License for more details.
17-
18-
You should have received a copy of the GNU Affero General Public License
19-
along with OpenBroadcaster Server. If not, see <http://www.gnu.org/licenses/>.
20-
*/
3+
// Copyright 2012-2024 OpenBroadcaster, Inc.
4+
// SPDX-License-Identifier: AGPL-3.0-or-later
215

226
if (!defined('TABLE_PREFIX')) {
237
define('TABLE_PREFIX', '');

‎classes/core/obfhelpers.php‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,7 @@
11
<?php
22

3-
/*
4-
Copyright 2012-2024 OpenBroadcaster, Inc.
5-
6-
This file is part of OpenBroadcaster Server.
7-
8-
OpenBroadcaster Server is free software: you can redistribute it and/or modify
9-
it under the terms of the GNU Affero General Public License as published by
10-
the Free Software Foundation, either version 3 of the License, or
11-
(at your option) any later version.
12-
13-
OpenBroadcaster Server is distributed in the hope that it will be useful,
14-
but WITHOUT ANY WARRANTY; without even the implied warranty of
15-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16-
GNU Affero General Public License for more details.
17-
18-
You should have received a copy of the GNU Affero General Public License
19-
along with OpenBroadcaster Server. If not, see <http://www.gnu.org/licenses/>.
20-
*/
3+
// Copyright 2012-2025 OpenBroadcaster, Inc.
4+
// SPDX-License-Identifier: AGPL-3.0-or-later
215

226
/**
237
* OpenBroadcaster helper functions.

‎classes/core/obfio.php‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,7 @@
11
<?php
22

3-
/*
4-
Copyright 2012-2024 OpenBroadcaster, Inc.
5-
6-
This file is part of OpenBroadcaster Server.
7-
8-
OpenBroadcaster Server is free software: you can redistribute it and/or modify
9-
it under the terms of the GNU Affero General Public License as published by
10-
the Free Software Foundation, either version 3 of the License, or
11-
(at your option) any later version.
12-
13-
OpenBroadcaster Server is distributed in the hope that it will be useful,
14-
but WITHOUT ANY WARRANTY; without even the implied warranty of
15-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16-
GNU Affero General Public License for more details.
17-
18-
You should have received a copy of the GNU Affero General Public License
19-
along with OpenBroadcaster Server. If not, see <http://www.gnu.org/licenses/>.
20-
*/
3+
// Copyright 2012-2025 OpenBroadcaster, Inc.
4+
// SPDX-License-Identifier: AGPL-3.0-or-later
215

226
/**
237
* Input/Output class. Outputs data and error messages.

‎classes/core/obfload.php‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,7 @@
11
<?php
22

3-
/*
4-
Copyright 2012-2024 OpenBroadcaster, Inc.
5-
6-
This file is part of OpenBroadcaster Server.
7-
8-
OpenBroadcaster Server is free software: you can redistribute it and/or modify
9-
it under the terms of the GNU Affero General Public License as published by
10-
the Free Software Foundation, either version 3 of the License, or
11-
(at your option) any later version.
12-
13-
OpenBroadcaster Server is distributed in the hope that it will be useful,
14-
but WITHOUT ANY WARRANTY; without even the implied warranty of
15-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16-
GNU Affero General Public License for more details.
17-
18-
You should have received a copy of the GNU Affero General Public License
19-
along with OpenBroadcaster Server. If not, see <http://www.gnu.org/licenses/>.
20-
*/
3+
// Copyright 2012-2024 OpenBroadcaster, Inc.
4+
// SPDX-License-Identifier: AGPL-3.0-or-later
215

226
/**
237
* Loading class. Manages the loading of OpenBroadcaster files, models, and

0 commit comments

Comments
 (0)