cd7e56e536
Cleanup temp file
2013-07-09 14:51:47 -07:00
06cef326fd
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-09 09:07:17 +01:00
c7ee677f2f
- Updated to version 2013.4 (2013d)
2013-07-09 09:07:16 +01:00
7045bd5c4a
Merge branch 'bump_pecl_check' into PHP-5.5
...
* bump_pecl_check:
Bump PECL package info version check to allow PECL installs with PHP 5.5+
2013-07-08 13:38:45 -07:00
6ac7c9d0a7
Bump PECL package info version check to allow PECL installs with PHP 5.5+
2013-07-08 13:32:04 -07:00
ac26d0e655
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Fixed segfault in mysqlnd when doing long prepare
2013-07-08 13:31:12 -07:00
79df8cf9c2
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Fixed segfault in mysqlnd when doing long prepare
2013-07-08 13:30:54 -07:00
2c3f6dcdb6
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4
...
Conflicts:
NEWS
2013-07-08 20:28:51 +02:00
dd71f1f173
Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5
2013-07-08 20:27:14 +02:00
3dd5f4ae4c
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
2013-07-08 20:24:58 +02:00
9fc38183b7
Fixed segfault in mysqlnd when doing long prepare
2013-07-08 20:23:32 +02:00
204137693c
Update NEWS
2013-07-08 19:21:52 +09:00
bde0f1318a
Added warning for hex2bin() when input is invalid string
2013-07-08 19:14:45 +09:00
bdfe70ab34
Update NEWS
2013-07-08 19:02:42 +09:00
2bc8271b29
Add warning to pg_unescape_bytea() when invalid parameter is passed
2013-07-08 18:51:37 +09:00
d1c261d7f8
array_column: Changing integer in test output to use %d
2013-07-06 20:50:34 +00:00
eed492ce84
Merge branch 'PHP-5.4' into PHP-5.5
...
# By Nuno Lopes (2) and Rob Richards (1)
* PHP-5.4:
truncate results at depth of 255 to prevent corruption
fix assembly of safe_address() for x86 and x86_64
fix assembly of safe_address() for x86 and x86_64
2013-07-06 08:00:58 -04:00
e4a28b7b7b
Merge branch 'PHP-5.3' into PHP-5.4
...
# By Rob Richards (1)
* PHP-5.3:
truncate results at depth of 255 to prevent corruption
2013-07-06 07:59:20 -04:00
7d163e8a08
truncate results at depth of 255 to prevent corruption
2013-07-06 07:53:07 -04:00
47e21a2c40
Fix assembly of safe_address() for aarch64
2013-07-04 10:25:38 +02:00
e964817b24
fix assembly of safe_address() for x86 and x86_64
2013-07-03 18:02:28 -04:00
c652cc93ec
fix assembly of safe_address() for x86 and x86_64
2013-07-03 17:56:02 -04:00
40cbceaf71
fix assembly of safe_address() for x86 and x86_64
2013-07-03 17:55:18 -04:00
332e46b3aa
Extended the test for bug #65184
2013-07-03 22:52:51 +02:00
00293fec05
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed build on FreeTDS 0.82
2013-07-03 15:02:39 -03:00
7549beb102
- Fixed build on FreeTDS 0.82
2013-07-03 15:02:03 -03:00
9aa7343ae0
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-03 17:10:58 +02:00
5bc7e597d9
Make sure return value is initialised in case transaction startup fails
2013-07-03 17:08:14 +02:00
631bb27dca
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
Zend/acinclude.m4
2013-07-03 16:58:20 +02:00
0265c2d961
Make sure result is initilized
...
Practically this could only be an issue when overriding mysqlnd from
an extension, but makes static analysis happy
2013-07-03 16:53:09 +02:00
5324416b65
Fixed bug #65184 strftime() returns insufficient-length
...
string under multibyte locales
The msdn doc states 'strftime returns the number of characters', but prior
to VS2012 it seems to have returned the number of bytes. Locale independent.
The return is however \0-terminated, so strlen is just fine. The behaivor
seems to be persisting in the later VC++ versions as the corresponding
MSDN ticket is closed 'by design'.
See http://connect.microsoft.com/VisualStudio/feedback/details/766205/vs2012-strftime-has-incorrect-return-value-in-vc-11-with-multibyte-codepages#details
2013-07-03 11:12:46 +02:00
74d434c091
Merge branch 'PHP-5.3' into PHP-5.4
2013-07-03 06:37:04 +02:00
50ac53e1b1
Add bison 2.6.4 to the list of supported versions
2013-07-03 06:36:54 +02:00
b52fea6f35
NEWS for two lst intl changes
2013-07-03 05:22:33 +01:00
9487f0b4bb
intl: fix extra space in constant name
2013-07-03 05:15:56 +01:00
a4538a4ca2
intl: add intlcal_set_minimal_days_in_first_week()
...
and IntlCalendar::setMinimalDaysInFirstWeek(). This one had slipped.
we had a ::getMinimalDaysInFirstWeek() but no way to change the value.
2013-07-03 05:06:32 +01:00
1aeb2514fe
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix typo in php man page
2013-07-02 12:19:37 +02:00
67817a199c
fix typo in php man page
2013-07-02 12:19:09 +02:00
4d5a2fba16
NEWS
2013-07-02 10:48:19 +02:00
8f0567581e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed Bug #65142 Missing phar man page
NEWS
Fixed Bug #65143 Missing php-cgi man page
2013-07-02 10:47:38 +02:00
f4ce5e7fb6
Fixed Bug #65142 Missing phar man page
...
Simple man page from phar help output.
2013-07-02 10:46:50 +02:00
4bc11af193
NEWS
2013-07-02 10:46:21 +02:00
c940aab789
Fixed Bug #65143 Missing php-cgi man page
...
Currently php-cgi man page is a simple redirect to
php (CLI) man page.
Could be splited / improved in the future.
2013-07-02 10:42:47 +02:00
1968fac697
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed mysql tests parsing phpinfo()
Update NEWS
Fixed bug #35703 : when session_name("123") consist only digits, should warning
Fixed bug #49175 : mod_files.sh does not support hash bits
2013-07-02 08:24:37 +02:00
743c4864eb
Fixed mysql tests parsing phpinfo()
2013-07-02 08:23:33 +02:00
bf8ed4708e
Add a few links
2013-07-01 16:48:18 -07:00
49a2cd93d6
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
# By Stanislav Malyshev (3) and others
# Via Stanislav Malyshev (3) and Nikita Popov (1)
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Don't try to clean up generator stack on unclean shutdown
NEWS
Added PHP_FCGI_BACKLOG, overrides the default listen backlog
Fixed bug #49175 : mod_files.sh does not support hash bits
add fix for #60560 into upgrading
Add a __wakeup() method to SplFixedArray, thereby fixing serialising an
Update NEWS
small optimization
fix bug #61860 : use USearch for searches, it does the right thing
2013-07-01 13:45:44 -07:00
06418aca28
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
...
# By Stanislav Malyshev (3) and others
# Via Stanislav Malyshev (1) and Yasuo Ohgaki (1)
* 'PHP-5.4' of https://git.php.net/repository/php-src :
Update NEWS
Fixed bug #35703 : when session_name("123") consist only digits, should warning
Fixed bug #49175 : mod_files.sh does not support hash bits
add fix for #60560 into upgrading
Add a __wakeup() method to SplFixedArray, thereby fixing serialising an
small optimization
fix bug #61860 : use USearch for searches, it does the right thing
2013-07-01 13:45:41 -07:00
0f36224beb
Don't try to clean up generator stack on unclean shutdown
...
This fixes bugs #65035 and #65161 . In one of the bugs the issue is
that function_state.arguments is NULL, but the arg count is pushed
to the stack and the code tries to free it. In the other bug the
stack of the generator is freed twice, once in generator_close and
later during shutdown.
It's rather hard (if at all possible) to do a proper stack cleanup
on an unclean shutdown, so I'm just disabling it in this case.
2013-06-29 21:51:54 +02:00
5904da9948
NEWS
2013-06-29 17:54:55 +02:00
Christopher Jones