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
Gustavo André dos Santos Lopes
2d2995f343
Fixed bug #61043 : Regression in magic_quotes_gpc fix (CVE-2012-0831)
...
Merge commit 'refs/pull/12/head' of git://github.com/php/php-src into 5.3
Signed-off-by: Gustavo André dos Santos Lopes <cataphract@php.net>
2012-03-21 21:12:31 +00:00
Ondřej Surý
d1fd5432e1
Fixed bug #61043 (Regression in magic_quotes_gpc fix for CVE-2012-0831)
2012-03-21 08:44:59 +01:00