clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-03 07:46:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,950 Commits 494 Branches 1,367 Tags 810 MiB
33472f78f9
Commit Graph

3837 Commits

Author SHA1 Message Date
Stanislav Malyshev
ebc80d62ec Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix missing parameter
 2013-01-27 17:11:53 -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
bbf1c9c4a7 Merge branch 'PHP-5.5' 2013-01-13 15:47:33 +01: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
Johannes Schlüter
712710bfec This will be PHP 5.3.22 2013-01-03 22:56:46 +01:00
Stanislav Malyshev
6da86acfae Merge branch 'PHP-5.5' 
* PHP-5.5:
  Bug #43177: If an eval() has a parse error, the overall exit status and return code should not be affected.
  fix NEWS
 2013-01-01 21:21:42 -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
642721b38a Merge branch 'PHP-5.5' 2013-01-01 16:39:03 +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
Xinchen Hui
a2045ff332 Happy New Year~ 2013-01-01 16:02:16 +08:00
Rasmus Lerdorf
d417a054e1 Merge branch 'PHP-5.5' 2012-12-19 23:01:00 -05: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
20113b5640 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #63757 (getenv() produces memory leak with CGI SAPI)
 2012-12-13 13:41:04 +04: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
Johannes Schlüter
22fe268ad4 this will become PHP 5.3.21 2012-12-05 18:55:05 +01:00
Stanislav Malyshev
c3b6f6feed 5.4.11-dev 2012-12-04 21:30:50 -08:00
Xinchen Hui
ff6c9e2726 Fixed bug #63377 (Segfault on output buffer) 2012-11-30 14:48:51 +08:00
Xinchen Hui
093d119597 Merge branch 'PHP-5.4' into PHP-5.5 2012-11-30 14:30:37 +08:00
Michael Wallner
178e9919b2 Merge branch 'PHP-5.4' 2012-11-28 10:24:42 +01: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
2e6a4a286e Merge branch 'PHP-5.5' 
* PHP-5.5:
  Bump API versions
 2012-11-13 20:58:51 +01:00
David Soria Parra
ad4a87f798 Bump API versions 2012-11-13 20:57:34 +01:00
David Soria Parra
d71577d2df Bump version to 5.6.0 2012-11-13 20:43:08 +01:00
David Soria Parra
012519839a Bump version to 5.5.99 and reset NEWS 2012-11-13 17:42:01 +01:00
Johannes Schlüter
417b1b238f This will be PHP 5.3.20 2012-11-08 00:01:43 +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
Johannes Schlüter
6b2b195267 This wil be PHP 5.3.16 2012-07-05 01:15:27 +02:00
Nikita Popov
d372b33c9b Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Improve JSON error handling

Conflicts:
	ext/json/tests/bug54058.phpt
	ext/json/tests/bug61537.phpt
 2012-06-27 12:28:55 +02:00
Stanislav Malyshev
2065bab102 Merge branch 'PHP-5.4' 
* PHP-5.4:
  typo fix
 2012-06-10 20:38:58 -07:00
Stanislav Malyshev
b55e69285b typo fix 2012-06-10 20:38:22 -07:00
Stanislav Malyshev
c83457ed13 Merge branch 'PHP-5.4' 
* PHP-5.4:
  improve overflow checks
  add NEWS
  fix potential overflow in _php_stream_scandir
 2012-06-08 01:23:07 -07:00
Stanislav Malyshev
59eaa7c877 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  improve overflow checks
  fix potential overflow in _php_stream_scandir
 2012-06-08 01:22:46 -07:00
Stanislav Malyshev
fc74503792 improve overflow checks 2012-06-08 01:21:37 -07:00
Stanislav Malyshev
426ccd3e7f Merge branch 'PHP-5.4' 
* PHP-5.4:
  fix potential overflow in _php_stream_scandir
 2012-06-07 23:09:37 -07:00
Stanislav Malyshev
10e8da1738 fix potential overflow in _php_stream_scandir 2012-06-07 23:09:18 -07:00
Stanislav Malyshev
7d04e0fb2e fix potential overflow in _php_stream_scandir 2012-06-07 23:08:35 -07:00
Johannes Schlüter
72a9b595ca PHP 5.3.15-dev 2012-05-16 16:49:35 +02:00
Stanislav Malyshev
be8b1c74cf to 5.4.5-dev 2012-05-15 22:46:49 -07:00
Michael Wallner
2d11e55b94 cleanup merge 2012-05-15 09:44:01 +02:00
Michael Wallner
0ad53bfd7d fix bug #60761 zlib.output_compression fails on refresh 2012-05-15 09:33:47 +02:00
Christopher Jones
d9788dd73f Bump to 5.4.4-dev 2012-05-14 12:43:36 -07:00
Johannes Schlüter
e120a0c7f3 This will be PHP 5.3.14 2012-05-08 11:28:15 +02:00
Nikita Popov
9e1b690e0c Merge branch 'PHP-5.4' 
* PHP-5.4:
  Add NEWS entry for bug #61961
  Fixed Bug #61961 (file_get_content leaks when access empty file with max length)
 2012-05-06 13:40:06 +02:00
Nikita Popov
bef6111609 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Add NEWS entry for bug #61961
  Fixed Bug #61961 (file_get_content leaks when access empty file with max length)
 2012-05-06 13:33:47 +02:00
Reeze Xia
3e9923dd8d Fixed Bug #61961 (file_get_content leaks when access empty file with max length) 2012-05-06 18:27:26 +08:00
Christopher Jones
31ab04ee25 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Bump to next version

Conflicts:
	configure.in
	main/php_version.h
 2012-05-03 12:22:39 -07:00
Christopher Jones
0956c00af9 Bump to next version 
Bump PHP version number
 2012-05-03 12:03:49 -07:00
Christopher Jones
701332ce30 Update to 5.4.2-dev 
After PHP-5.4.1 was branched, the PHP-5.4 branch should have been 5.4.2-dev.
 2012-04-19 10:45:21 -07:00
Xinchen Hui
579d234f50 Merge branch 'PHP-5.4' 2012-04-15 01:17:56 +08:00
Xinchen Hui
3b42f184cd Fixed bug #61728 (php-fpm SIGSEGV running friendica on nginx) 2012-04-15 01:16:34 +08:00
Gustavo André dos Santos Lopes
bd5f52fd94 Merge branch '5.4' 2012-04-07 16:34:37 +01:00
Gustavo André dos Santos Lopes
f7d4076785 Merge branch '5.3' into 5.4 2012-04-07 16:34:17 +01:00
Gustavo André dos Santos Lopes
0f180a63eb Fixed bug in new stream_get_line() when using NUL as a delimiter. 
This is the issue Derick spotted a few days ago..
 2012-04-07 16:32:19 +01:00
Xinchen Hui
7497aa9c4e Merge branch 'PHP-5.4' 
* PHP-5.4:
  Update NEWS
  Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables (without apache2))
 2012-04-06 22:00:15 +08:00
Xinchen Hui
b0f09b69d3 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables (without apache2))
 2012-04-06 21:57:56 +08:00
Xinchen Hui
9bf8cd4b34 Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables (without apache2)) 2012-04-06 21:42:40 +08:00
Gustavo André dos Santos Lopes
ca58cd01fc Cherry-pick 4cc74767 
Headers: forbid \r and \n also after \0, allow CRLF followed by HT or SP and forbid \0. See bug #60227.

Conflicts:

	ext/standard/tests/general_functions/bug60227.phpt
	ext/standard/tests/general_functions/bug60227_1.phpt
	ext/standard/tests/general_functions/bug60227_2.phpt
	main/SAPI.c
 2012-04-04 09:59:51 +01:00
Xinchen Hui
f7bf83546e Fix warning "suggest parentheses around assignment" 2012-04-04 16:35:32 +08:00
Xinchen Hui
06290cc049 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #61605 (header_remove() does not remove all headers)

Conflicts:
	NEWS
 2012-04-04 16:16:54 +08:00
Xinchen Hui
efd671f242 Fixed bug Fixed bug #61605 (header_remove() does not remove all headers) 2012-04-04 16:14:28 +08:00
Xinchen Hui
896c4539df Fixed bug #61605 (header_remove() does not remove all headers) 2012-04-04 16:01:43 +08:00
Klaus Silveira
16bd11062e Small performance improvement. The current code is correct, but if it is used inside a long loop or long strings, it's inefficient. 2012-04-02 22:54:57 -03:00
David Soria Parra
cae2556462 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Cleanup Safe Mode related comment in SG(request_info)
 2012-03-31 09:34:43 +02:00
David Soria Parra
3bf53aa911 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Cleanup Safe Mode related comment in SG(request_info)
 2012-03-31 09:34:25 +02:00
reeze
ff8be9845f Cleanup Safe Mode related comment in SG(request_info) 2012-03-31 09:34:08 +02:00
Johannes Schlüter
fb124764de This will be PHP 5.3.12 2012-03-29 11:22:44 +02:00
reeze
abd2b2ee43 - fix bug #61541, Segfault when using ob_* in output_callback 2012-03-29 06:23:05 +09:00