Commit Graph

3778 Commits

Author SHA1 Message Date
Gustavo Lopes
e8f0e863ae Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix wrong blocking state being set
  Fix tests (Windows)
  Remove a Windows only warning
  Move & improve PHP_SOCKET_ERROR def
  Move some declarations to sockets.c
  Fix overbroad skipif include
2013-02-02 15:32:03 +01:00
Gustavo Lopes
24e380f970 Remove a Windows only warning 2013-02-02 15:29:18 +01:00
Stanislav Malyshev
09b6e33b40 branched 5.4.12 2013-01-29 12:33:45 -08:00
Stanislav Malyshev
748b37654d complete zts fix 2013-01-29 12:12:34 -08:00
Felipe Pena
37c304b5db - Fixed ZTS build 2013-01-29 09:26:54 -02:00
ALeX Kazik
475a644bd8 Implemented Feature #60524 (sys_temp_dir)
Added a new configuration directive which allows it to change the
temporary directory, the default behavior is unchanged.

This is a useful option if you use all/some hosts inside of one .ini file
with sections and want to change the temp dir per user (maybe it's not
allowed to write outside the users home directory). Since the TMPDIR
variable affects the whole php that way can not be used for this scenario.

(see https://bugs.php.net/bug.php?id=60524)
2013-01-28 22:37:43 -08:00
Stanislav Malyshev
581db9c5fa Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix missing parameter
2013-01-27 17:11:36 -08:00
Andras Elso
3e6d633a0d Fix missing parameter 2013-01-27 17:11:14 -08:00
Arnaud Le Blanc
718afb9acf Merge branch 'PHP-5.4' into PHP-5.5 2013-01-13 15:47:12 +01:00
Arnaud Le Blanc
a06313fe5a fixed alternate form for 'x' and 'X' formats
same fix exists in original code:
https://svn.apache.org/viewvc?view=revision&revision=1152309
2013-01-13 15:45:15 +01:00
Stanislav Malyshev
5894aa0950 5.4.12-dev 2013-01-03 17:25:56 -08:00
Stanislav Malyshev
80a9a80a52 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Bug #43177: If an eval() has a parse error, the overall exit status and return code should not be affected.
  fix NEWS

Conflicts:
	main/main.c
2013-01-01 21:20:35 -08:00
Stanislav Malyshev
36e19c9cab Bug #43177: If an eval() has a parse error, the overall exit status and return code should not be affected.
Without this fix, a webpage using eval() may return code 500.  That might display
fine and the 500 go unnoticed, but using AJAX or wget, the 500 will cause problems.
2013-01-01 21:18:59 -08:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Rasmus Lerdorf
d5fe89670e Merge branch 'PHP-5.4' into PHP-5.5 2012-12-19 23:00:41 -05:00
Rasmus Lerdorf
180b9e150b Fix for bug #63811 2012-12-19 22:58:18 -05:00
Dmitry Stogov
4b1b115633 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed bug #63757 (getenv() produces memory leak with CGI SAPI)

Conflicts:
	NEWS
2012-12-13 13:40:42 +04:00
Dmitry Stogov
35f86d24d8 Fixed bug #63757 (getenv() produces memory leak with CGI SAPI) 2012-12-13 13:39:42 +04:00
Stanislav Malyshev
c3b6f6feed 5.4.11-dev 2012-12-04 21:30:50 -08:00
Xinchen Hui
093d119597 Merge branch 'PHP-5.4' into PHP-5.5 2012-11-30 14:30:37 +08:00
Michael Wallner
575790e842 fix bug #61272 ob_start callback get passed empty string 2012-11-28 10:19:44 +01:00
Stanislav Malyshev
7262bf67a2 5.4.10-dev 2012-11-24 16:24:05 -08:00
David Soria Parra
ad4a87f798 Bump API versions 2012-11-13 20:57:34 +01:00
Gustavo Lopes
f8e26d95f2 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #63240 on stream_get_line()
2012-10-12 20:24:13 +02:00
Gustavo Lopes
76601c4fd1 Fix bug #63240 on stream_get_line()
stream_get_line() could contain the delimiter string if that string
had more than one character. The bug manifested itself when a read on
the stream ended with part of the delimiter string and the read after
would start with the rest of the delimiter string; provided that
the data of first read did not complete the max length result of the
call to stream_get_line() with the partial delimiter used in that max
length return. In that case, the delimiter will still appear in
the result, divided in two subsequent return values. That is not a bug.

See <http://www.mail-archive.com/internals@lists.php.net/msg61325.html>
2012-10-12 20:23:43 +02:00
Xinchen Hui
e4a8fa6a15 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-09 13:29:51 +08:00
Xinchen Hui
6284ef112e Fixed bug #63236 (Executable permission on various source files) 2012-10-09 13:28:31 +08:00
Stanislav Malyshev
9e3396b85d 5.4.9-dev 2012-10-03 18:36:17 -07:00
Johannes Schlüter
64c09f68ec PHP-5.3 branch is 5.3.19 now 2012-10-04 02:35:42 +02:00
Gustavo Lopes
2634f55992 Merge branch 'PHP-5.4'
* PHP-5.4:
  Fix bug #63240 on stream_get_line()
2012-10-12 20:24:28 +02:00
Xinchen Hui
75a2c0d715 Merge branch 'PHP-5.4' 2012-10-09 13:30:22 +08:00
Xinchen Hui
923511d364 Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
Cherry pick to 5.3
2012-09-24 10:59:06 +08:00
Xinchen Hui
8fcb4f1107 Merge branch 'PHP-5.4' 2012-09-23 23:00:15 +08:00
Xinchen Hui
395d77c540 Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo) 2012-09-23 22:59:31 +08:00
Rasmus Lerdorf
fa5477d9d4 Fix folding 2012-09-20 14:24:55 -04:00
Rasmus Lerdorf
2322be0fab Fix folding 2012-09-20 14:22:15 -04:00
Johannes Schlüter
9e91d621e3 This will become 5.3.18 2012-09-13 23:08:30 +02:00
Dmitry Stogov
04789300a4 Merge branch 'PHP-5.4'
* PHP-5.4:
  Fixed unintendent clearance of PHP_OUTPUT_ACTIVATED flag
2012-09-10 14:57:45 +04:00
Dmitry Stogov
62d86209cf Fixed unintendent clearance of PHP_OUTPUT_ACTIVATED flag 2012-09-10 14:54:18 +04:00
Stanislav Malyshev
55b3386a81 update version id too 2012-08-28 22:10:34 -07:00
Stanislav Malyshev
78cffe0c4d 5.4.7 branched 2012-08-28 22:07:08 -07:00
Adam Harvey
14847af41d Update version numbers to 5.4.7-dev. 2012-08-17 23:07:54 +08:00
Stanislav Malyshev
054e41f4ae Merge branch 'PHP-5.4'
* PHP-5.4:
  News for bug#40459
  fix bug #40459 - make all stream funcs that create object call ctor
2012-08-09 00:12:22 -07:00
Stanislav Malyshev
4db70fd406 fix bug #40459 - make all stream funcs that create object call ctor 2012-08-07 22:59:12 -07:00
Stanislav Malyshev
c9eb64127e Merge branch 'pull-request/132'
* pull-request/132:
  OK, bye bye JavaScript, let's just include credits before license
  Nicer (JSLint-compliant!) credits reveal JavaScript
  Removed now-unnecessary expose_php checks for logo
  Fixed small misalignment in prev commit
  Removed Logo GUIDs and replaced with Data URIs and div hidden with JS
2012-08-05 21:15:53 -07:00
Andrew Faulds
d12f8d6790 Removed Logo GUIDs and replaced with Data URIs and div hidden with JS
- removed php_logo_guid()
- removed php_egg_logo_guid()
- removed php_real_logo_guid()
- removed zend_logo_guid()
- removed logo GUID handling
- removed logo GUIDs from source
- added logo data URIs instead for phpinfo()
- added credits to phpinfo() page, but hidden by default
2012-07-14 21:44:21 +01:00
Felipe Pena
d2beb0fc05 Merge branch 'PHP-5.4'
* PHP-5.4:
  - Fixed bug #62525 (sigabrt while converting floating point to string)
2012-07-14 15:15:42 -03:00
Felipe Pena
3728e50e9f Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  - Fixed bug #62525 (sigabrt while converting floating point to string)
2012-07-14 15:15:24 -03:00
Felipe Pena
63f3962a90 - Fixed bug #62525 (sigabrt while converting floating point to string) 2012-07-14 15:15:11 -03:00