Commit Graph

75298 Commits

Author SHA1 Message Date
Johannes Schlüter
d7a59d7dac Merge branch 'PHP-5.5' 2013-07-03 17:11:20 +02:00
Johannes Schlüter
9aa7343ae0 Merge branch 'PHP-5.4' into PHP-5.5 2013-07-03 17:10:58 +02:00
Johannes Schlüter
5bc7e597d9 Make sure return value is initialised in case transaction startup fails 2013-07-03 17:08:14 +02:00
Johannes Schlüter
ebd94fa30d Merge branch 'PHP-5.5' 2013-07-03 16:59:17 +02:00
Johannes Schlüter
631bb27dca Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
	Zend/acinclude.m4
2013-07-03 16:58:20 +02:00
Johannes Schlüter
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
Anatol Belski
9365967dfd Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #65184 strftime() returns insufficient-length
  NEWS for two lst intl changes
2013-07-03 11:25:09 +02:00
Anatol Belski
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
Sebastian Bergmann
9f5fc5c0ee Sync list of supported bison version with PHP-5.5 2013-07-03 06:52:44 +02:00
Sebastian Bergmann
74d434c091 Merge branch 'PHP-5.3' into PHP-5.4 2013-07-03 06:37:04 +02:00
Sebastian Bergmann
50ac53e1b1 Add bison 2.6.4 to the list of supported versions 2013-07-03 06:36:54 +02:00
Gustavo André dos Santos Lopes
b52fea6f35 NEWS for two lst intl changes 2013-07-03 05:22:33 +01:00
Gustavo André dos Santos Lopes
c1db6f8bdd Merge branch 'PHP-5.5'
* PHP-5.5:
  intl: fix extra space in constant name
  intl: add intlcal_set_minimal_days_in_first_week()
2013-07-03 05:17:04 +01:00
Gustavo André dos Santos Lopes
9487f0b4bb intl: fix extra space in constant name 2013-07-03 05:15:56 +01:00
Gustavo André dos Santos Lopes
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
Remi Collet
c28e77cbbc Merge branch 'PHP-5.5'
* PHP-5.5:
  fix typo in php man page
2013-07-02 12:19:43 +02:00
Remi Collet
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
Remi Collet
67817a199c fix typo in php man page 2013-07-02 12:19:09 +02:00
Remi Collet
0ecf03ff38 Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS
  Fixed Bug #65142 Missing phar man page
  NEWS
  Fixed Bug #65143 Missing php-cgi man page
2013-07-02 10:48:38 +02:00
Remi Collet
4d5a2fba16 NEWS 2013-07-02 10:48:19 +02:00
Remi Collet
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
Remi Collet
f4ce5e7fb6 Fixed Bug #65142 Missing phar man page
Simple man page from phar help output.
2013-07-02 10:46:50 +02:00
Remi Collet
4bc11af193 NEWS 2013-07-02 10:46:21 +02:00
Remi Collet
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
Anatol Belski
a1c2dbb466 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed mysql tests parsing phpinfo()
  Add a few links
  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:25:01 +02:00
Anatol Belski
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
Anatol Belski
743c4864eb Fixed mysql tests parsing phpinfo() 2013-07-02 08:23:33 +02:00
Christopher Jones
bf8ed4708e Add a few links 2013-07-01 16:48:18 -07:00
Christopher Jones
7a331856df Merge branch 'master' of https://git.php.net/repository/php-src
# By Yasuo Ohgaki (5) and others
# Via Stanislav Malyshev (5) and others
* 'master' of https://git.php.net/repository/php-src:
  added test code for #65045.
  fixed #65045: mb_convert_encoding breaks well-formed character.
  Don't try to clean up generator stack on unclean shutdown
  NEWS
  Added PHP_FCGI_BACKLOG, overrides the default listen backlog
  Merge branch 'PHP-5.5' into master
  Fixed bug #49175: mod_files.sh does not support hash bits
  Fixed bug #35703: when session_name("123") consist only digits, should warning
  Fixed bug #49175: mod_files.sh does not support hash bits
  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:46:01 -07:00
Christopher Jones
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
Christopher Jones
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
Rui Hirokawa
1db66942e1 added test code for #65045. 2013-06-30 15:31:36 +09:00
Rui Hirokawa
c6a7549efc fixed #65045: mb_convert_encoding breaks well-formed character. 2013-06-30 15:30:45 +09:00
Nikita Popov
4d606cf01e Merge branch 'PHP-5.5' 2013-06-29 21:57:36 +02:00
Nikita Popov
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
Arnaud Le Blanc
4cf20656ba Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS
  Added PHP_FCGI_BACKLOG, overrides the default listen backlog
2013-06-29 17:55:39 +02:00
Arnaud Le Blanc
5904da9948 NEWS 2013-06-29 17:54:55 +02:00
Arnaud Le Blanc
18f45c535b Added PHP_FCGI_BACKLOG, overrides the default listen backlog 2013-06-29 17:52:04 +02:00
Yasuo Ohgaki
46214a23b8 Update NEWS 2013-06-29 11:38:23 +09:00
Yasuo Ohgaki
87dda666c7 Fixed bug #35703: when session_name("123") consist only digits, should warning 2013-06-29 11:35:55 +09:00
Yasuo Ohgaki
ef63334fa6 Fixed bug #49175: mod_files.sh does not support hash bits 2013-06-29 11:35:55 +09:00
Yasuo Ohgaki
bedadf2bb2 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #35703: when session_name("123") consist only digits, should warning
2013-06-29 09:44:45 +09:00
Yasuo Ohgaki
cfa667846f Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed bug #35703: when session_name("123") consist only digits, should warning
2013-06-29 09:43:06 +09:00
Yasuo Ohgaki
f1c8d0b4e3 Merge branch 'PHP-5.5' into master
Fixed bug #49175: mod_files.sh does not support hash bits
2013-06-29 09:23:37 +09:00
Yasuo Ohgaki
27b01cfcd7 Fixed bug #49175: mod_files.sh does not support hash bits 2013-06-29 09:09:23 +09:00
Yasuo Ohgaki
bfb4c3156f Fixed bug #35703: when session_name("123") consist only digits, should warning 2013-06-29 08:07:44 +09:00
Yasuo Ohgaki
5f0656b89d Fixed bug #49175: mod_files.sh does not support hash bits 2013-06-29 06:50:07 +09:00
Yasuo Ohgaki
520c08adf0 Fixed bug #49175: mod_files.sh does not support hash bits 2013-06-29 06:45:18 +09:00
Stanislav Malyshev
66667dda47 Merge branch 'PHP-5.5'
* PHP-5.5:
  add fix for  #60560 into upgrading
2013-06-28 14:02:12 -07:00
Stanislav Malyshev
657d486013 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  add fix for  #60560 into upgrading
2013-06-28 14:01:53 -07:00