1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

10626 Commits

Author SHA1 Message Date
Andreas Fischer
84ff04056a Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [ticket/10233] IE Emulation fix breaks PM posting layout
2011-06-26 20:41:59 +02:00
Andreas Fischer
1ae42ae6ba Merge remote-tracking branch 'naderman/ticket/10233' into prep-release-3.0.9
* naderman/ticket/10233:
  [ticket/10233] IE Emulation fix breaks PM posting layout
2011-06-26 20:40:59 +02:00
Andreas Fischer
cdc23a9877 Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [ticket/10188] Prevent semi-compressed output
2011-06-26 20:40:25 +02:00
Andreas Fischer
f249287dc9 Merge remote-tracking branch 'naderman/ticket/10188' into prep-release-3.0.9
* naderman/ticket/10188:
  [ticket/10188] Prevent semi-compressed output
2011-06-26 20:39:54 +02:00
Nils Adermann
a5ef6c3b20 [ticket/10188] Prevent semi-compressed output
When a non-fatal error occurs at the beginning of the script before any custom
error handler is set one of two situations can be encountered:

1) if the ini option output buffer is disabled:
      - headers are sent to the http client
      - the error message is output
2) if the ini option output_buffer is enabled or the script
   is run within an ob_start()/ob_end() wrapper:
      - the error message is written to the output buffer

Once the script reaches page_header() phpbb starts gzip compression if enabled.
This is done through ob_start with a ob_gzhandler as a callback. The
compression is skipped if headers have already been sent. In situation 1) the
error message sent in plain text comes with headers and this gzip compression
is skipped. The client receives a plaintext version of the page. However in
situation 2) headers have not been sent yet and the rest of the page will be
compressed. The result is a plaintext error message followed by compressed
output. The client does not understand this output resulting in either an
error message or simply a blank page in the browser.

In addition to the above situation this problem occurs with errors that are
triggered after the custom error handler is loaded. The problem has been
noticed before, and a workaround was found. The error handler would call
ob_flush() for particular configuration settings before outputting the error
message. This resulted in headers being sent when output buffering was enabled
thus disabling gzip compression for the rest of the page. The constraints under
which ob_flush() was called were lessened over time whenever a new case was
found that would trigger this problem. Eventually ob_flush() would be called
even when code causing an E_NOTICE was simply run within an ob_start/ob_end.
This makes it impossible to use output buffering to retrieve the content of an
error message without prohibiting the page from setting headers afterwards.

This commit removes all flushing in msg_handler completely and instead fixes
the problem for both errors before and after the error handler is registered.
GZIP compression is only enabled if there is at most one level of output
buffering (e.g. the output_buffer php.ini option is enabled) and if there has
not yet been any output in this buffer. This should avoid any partial output
compression.

PHPBB3-10188
2011-06-26 20:31:22 +02:00
Raimon
d59482366a [ticket/10233] IE Emulation fix breaks PM posting layout
The minimum and maximum width of 100% make the textarea dynamically
adjust. However the smilies next to the textarea will float out of
their containing div when the default width pre-min/max is specified
as a too high value.

PHPBB3-10233
2011-06-26 11:10:05 +02:00
Nils Adermann
0e067ec3c2 Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [ticket/7729] Prevent date/time functions from throwing E_WARNING on PHP 5.3.
2011-06-26 01:37:30 +02:00
Nils Adermann
fc5a68c2cf Merge branch 'ticket/bantu/7729' into prep-release-3.0.9
* ticket/bantu/7729:
  [ticket/7729] Prevent date/time functions from throwing E_WARNING on PHP 5.3.
2011-06-26 01:36:16 +02:00
Andreas Fischer
9f3b159998 [ticket/7729] Prevent date/time functions from throwing E_WARNING on PHP 5.3.
PHPBB3-7729
2011-06-25 17:42:52 +02:00
Andreas Fischer
29df4b5c60 Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [ticket/10228] Correct "trigger" to "triggered" in acp registration settings
2011-06-22 02:32:27 +02:00
Andreas Fischer
1ffa586583 Merge remote-tracking branch 'naderman/ticket/10228' into prep-release-3.0.9
* naderman/ticket/10228:
  [ticket/10228] Correct "trigger" to "triggered" in acp registration settings
2011-06-22 02:32:13 +02:00
Nils Adermann
237af043d6 [ticket/10228] Correct "trigger" to "triggered" in acp registration settings
PHPBB3-10228
2011-06-22 02:27:37 +02:00
rxu
18fb3d86cd [ticket/10226] Use is_numeric() instead of preg_replace()
PHPBB3-10226
2011-06-21 22:03:19 +08:00
rxu
578f9dffa6 [ticket/10226] Allow mysqli connections via local sockets/pipes
PHPBB3-10226
2011-06-21 00:55:10 +08:00
Nils Adermann
fd7e29131e Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [ticket/10234] Report E_WARNING errors as "PHP Warning" instead of "PHP Notice"
2011-06-20 00:35:17 +02:00
Nils Adermann
b7069f395b Merge branch 'ticket/bantu/10234' into prep-release-3.0.9
* ticket/bantu/10234:
  [ticket/10234] Report E_WARNING errors as "PHP Warning" instead of "PHP Notice"
2011-06-20 00:33:38 +02:00
Andreas Fischer
e0ecd3e118 Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [ticket/10223] Make definition of phpbb_require_updated conditional
2011-06-20 00:28:35 +02:00
Andreas Fischer
d5c2bbf620 Merge remote-tracking branch 'naderman/ticket/10223' into prep-release-3.0.9
* naderman/ticket/10223:
  [ticket/10223] Make definition of phpbb_require_updated conditional
2011-06-20 00:28:02 +02:00
Andreas Fischer
8c01ed578d [ticket/10234] Report E_WARNING errors as "PHP Warning" instead of "PHP Notice"
PHPBB3-10234
2011-06-20 00:03:20 +02:00
Nils Adermann
ad5ed9d0ee [ticket/10223] Make definition of phpbb_require_updated conditional
The automatic updater defines it too and includes database_update.php
for updating which causes an error otherwise.

PHPBB3-10223
2011-06-20 00:00:30 +02:00
Andreas Fischer
1320bb7bf8 Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [ticket/10223] Replace spaces with tabs
2011-06-19 23:12:21 +02:00
Andreas Fischer
6a4ca8cad9 Merge remote-tracking branch 'naderman/ticket/10223' into prep-release-3.0.9
* naderman/ticket/10223:
  [ticket/10223] Replace spaces with tabs
2011-06-19 23:11:57 +02:00
Nils Adermann
67fde80fbb [ticket/10223] Replace spaces with tabs
PHPBB3-10223
2011-06-19 23:02:59 +02:00
Andreas Fischer
ee2d4f627a Merge remote-tracking branch 'rxu/ticket/10227' into develop-olympus
* rxu/ticket/10227:
  [ticket/10227] Allow persistent connections for mysqli with PHP 5.3.0+
2011-06-19 17:58:36 +02:00
Andreas Fischer
b43907d69e Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [ticket/10232] Renamed S_SEARCH_HIDDEN_FIELDS to S_SEARCH_LOCAL_HIDDEN_FIELDS
2011-06-19 17:58:07 +02:00
Andreas Fischer
e2fe25fbdc Merge remote-tracking branch 'naderman/ticket/10232' into prep-release-3.0.9
* naderman/ticket/10232:
  [ticket/10232] Renamed S_SEARCH_HIDDEN_FIELDS to S_SEARCH_LOCAL_HIDDEN_FIELDS
2011-06-19 17:57:56 +02:00
Andreas Fischer
4e85731a5f Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [ticket/10223] The search fid parameter is an array of forums not just an id
  [ticket/10223] Check optional before file_exists and correct require path
  [ticket/10223] requiring the new startup.php file conditionally.
2011-06-19 17:57:29 +02:00
Andreas Fischer
c4c22d4421 Merge remote-tracking branch 'naderman/ticket/10223' into prep-release-3.0.9
* naderman/ticket/10223:
  [ticket/10223] The search fid parameter is an array of forums not just an id
  [ticket/10223] Check optional before file_exists and correct require path
  [ticket/10223] requiring the new startup.php file conditionally.
2011-06-19 17:56:30 +02:00
rxu
7de078b26e [ticket/10227] Allow persistent connections for mysqli with PHP 5.3.0+
PHPBB3-10227
2011-06-19 19:03:53 +08:00
Nils Adermann
d37e8dd6d3 [ticket/10223] The search fid parameter is an array of forums not just an id
PHPBB3-10223
2011-06-19 00:13:33 +02:00
Nils Adermann
d3f1b60292 [ticket/10223] Check optional before file_exists and correct require path
PHPBB3-10223
2011-06-18 23:48:37 +02:00
Nils Adermann
6458a1a16a [ticket/10232] Renamed S_SEARCH_HIDDEN_FIELDS to S_SEARCH_LOCAL_HIDDEN_FIELDS
Avoids the global hidden fields from functions.php overwriting local
searches.

PHPBB3-10232
2011-06-18 23:22:25 +02:00
Andreas Fischer
4ac9bde2d1 Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [ticket/10229] On languge/acp/styles.php "%s" should be %s
2011-06-18 15:12:38 +02:00
Andreas Fischer
882cb084d7 Merge remote-tracking branch 'Raimon/ticket/10229' into prep-release-3.0.9
* Raimon/ticket/10229:
  [ticket/10229] On languge/acp/styles.php "%s" should be %s
2011-06-18 15:11:59 +02:00
Raimon
dd0606a317 [ticket/10229] On languge/acp/styles.php "%s" should be %s
PHPBB3-10229
2011-06-18 15:00:39 +02:00
Nils Adermann
1b0821a11b [ticket/10223] requiring the new startup.php file conditionally.
Added a function for this which we can potentially apply to more of the files in the
installer and database updater.

PHPBB3-10223
2011-06-18 01:02:58 +02:00
Andreas Fischer
bb1b52947e Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [prep-release-3.0.9] Update Changelog for 3.0.9-RC2 release.
2011-06-16 16:18:11 +02:00
Andreas Fischer
2bae5298e0 [prep-release-3.0.9] Update Changelog for 3.0.9-RC2 release. release-3.0.9-RC2 2011-06-16 16:16:55 +02:00
Andreas Fischer
bd6e27d9c5 Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [ticket/10221] Append unit (seconds) after input field, remove from explanation
2011-06-16 16:11:27 +02:00
Andreas Fischer
1d349ee5a8 Merge remote-tracking branch 'naderman/ticket/10221' into prep-release-3.0.9
* naderman/ticket/10221:
  [ticket/10221] Append unit (seconds) after input field, remove from explanation
2011-06-16 16:11:20 +02:00
Nils Adermann
63b9b91dee [ticket/10221] Append unit (seconds) after input field, remove from explanation
PHPBB3-10221
2011-06-16 16:02:34 +02:00
Andreas Fischer
aa0c70058b Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [prep-release-3.0.9] Bumping version number for 3.0.9-RC2.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2011-06-15 19:46:28 +02:00
Andreas Fischer
48e5e56146 [prep-release-3.0.9] Bumping version number for 3.0.9-RC2. 2011-06-15 19:41:14 +02:00
Andreas Fischer
79f757d4b7 Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [ticket/10218] Prevent startime from being overwritten by deregister_globals()
  [ticket/10218] Moving global deregistration, etc. to startup.php

Conflicts:
	phpBB/install/database_update.php
2011-06-15 18:51:04 +02:00
Andreas Fischer
2d6df4c7fc Merge remote-tracking branch 'Marshalrusty/ticket/10218' into prep-release-3.0.9
* Marshalrusty/ticket/10218:
  [ticket/10218] Prevent startime from being overwritten by deregister_globals()
  [ticket/10218] Moving global deregistration, etc. to startup.php
2011-06-15 18:50:14 +02:00
Andreas Fischer
1e8c257bd4 Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [ticket/10220] Limit user agent value length for storage in login attempt table
2011-06-15 18:47:27 +02:00
Andreas Fischer
d2eebd7682 Merge remote-tracking branch 'naderman/ticket/10220' into prep-release-3.0.9
* naderman/ticket/10220:
  [ticket/10220] Limit user agent value length for storage in login attempt table
2011-06-15 18:47:26 +02:00
Andreas Fischer
bf3bac8772 Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [ticket/10219] Remove invalid and invisible character from web.config.
2011-06-15 18:47:24 +02:00
Nils Adermann
74785a8bda [ticket/10220] Limit user agent value length for storage in login attempt table
PHPBB3-10220
2011-06-15 18:20:16 +02:00
Igor Wiedler
62a51e681e Merge remote-tracking branch 'bantu/ticket/10219' into prep-release-3.0.9
* bantu/ticket/10219:
  [ticket/10219] Remove invalid and invisible character from web.config.
2011-06-15 08:02:00 +02:00