Commit Graph

32131 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
d231111972 Merge branch 'PHP-5.5'
* PHP-5.5:
  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-06-28 13:56:31 -07:00
Stanislav Malyshev
4020ef8980 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  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-06-28 13:56:11 -07:00
Stanislav Malyshev
e46beabe8f Merge branch 'bug61860' into PHP-5.4
* bug61860:
  small optimization
  fix bug #61860: use USearch for searches, it does the right thing
2013-06-28 13:54:57 -07:00
Adam Harvey
3becd3879f Add a __wakeup() method to SplFixedArray, thereby fixing serialising an
SplFixedArray object and bug #60560 (SplFixedArray un-/serialize, getSize(),
count() return 0, keys are strings).
2013-06-28 13:50:33 -07:00
Arpad Ray
da31bef9cb Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented
  Update NEWS
  BC fix for PR 109 merge - create_sid() method in SessionHandler
  Tests, fixes and optimisations
  Add create_sid to session_set_save_handler and SessionHandler
2013-06-27 19:25:11 +01:00
Arpad Ray
70ae67b5da Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented
2013-06-27 19:12:46 +01:00
Arpad Ray
ce8c023910 Fix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented
When uploading multiple files, the array in the session where the progress
data is stored (and cancel_upload key is set) was overwritten whenever the
progress data was updated, so pending uploads would proceed anyway.
2013-06-27 19:05:23 +01:00
Arpad Ray
ada46c75f4 BC fix for PR 109 merge - create_sid() method in SessionHandler
Creates a new SessionIdInterface and moves create_sid() into it, so existing
handlers implementing SessionHandlerInterface don't require create_sid().
SessionHandler still includes the method so the default mod can be called, but
now implements both interfaces.

Also added several more tests for this feature.
2013-06-27 13:06:22 +01:00
Leigh
b794cce4fd Tests, fixes and optimisations
* Amended existing tests to cater for new functionality.
* Implemented fixes and optimisations recommended by NikiC
* Added create_sid to the registered interface. This was breaking
tests. It also now breaks BC for people implementing the interface
directly instead of extending the class.
2013-06-27 13:06:22 +01:00
Leigh
074c26a68b Add create_sid to session_set_save_handler and SessionHandler
A lot of code already existed to allow a custom create_sid handler, but
lacked a specific implementation.

Therefore I have added a 7th (optional) argument
session_set_save_handler, to allow a user function to be supplied for
session id generation.

If a create_sid function is not supplied, the default function is
called in its absence to preserve backwards compatibility.

Likewise create_sid only added to SessionHandler class, and not the
interface to maintain backwards compatibility. If the result is not
overridden, the default is called.
2013-06-27 13:06:22 +01:00
Anatol Belski
eb190bb571 Fixed symbol export
That's needed for baabd11929 to link
properly.
2013-06-27 14:00:56 +02:00
Arpad Ray
1e836cdd64 BC fix for PR 109 merge - create_sid() method in SessionHandler
Creates a new SessionIdInterface and moves create_sid() into it, so existing
handlers implementing SessionHandlerInterface don't require create_sid().
SessionHandler still includes the method so the default mod can be called, but
now implements both interfaces.

Also added several more tests for this feature.
2013-06-27 12:33:56 +01:00
Arpad Ray
b66c14b0c8 Merge PR 109 - Add create_sid to session_set_save_handler and SessionHandler
Allows user session handlers to create session IDs by adding an optional
7th argument to session_set_save_handler() and a create_sid() method
to SessionHandler.
2013-06-27 12:29:44 +01:00
Xinchen Hui
a441d9274b Merge branch 'PHP-5.5' 2013-06-27 12:38:52 +08:00
Xinchen Hui
c2cfc242c4 Merge branch 'PHP-5.4' into PHP-5.5 2013-06-27 12:38:13 +08:00
Xinchen Hui
fa8611c81e Fixed bug #65136 (RecursiveDirectoryIterator segfault) 2013-06-27 12:37:57 +08:00
Felipe Pena
86a54638ed Merge branch 'PHP-5.5'
* PHP-5.5:
  - BFN
  - Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: askalski at gmail dot com
  - Reclassify bug
2013-06-26 19:16:37 -03:00
Felipe Pena
402b3aaf56 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - BFN
  - Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: askalski at gmail dot com
  - Reclassify bug
2013-06-26 19:16:26 -03:00
Felipe Pena
60dcc5851f - Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: askalski at gmail dot com 2013-06-26 19:15:19 -03:00
Felipe Pena
c6a218c76b Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fixed bug #63409 (php-dba function test fails on big-endian machine) patch by: tianhonglouis at gmail dot com
2013-06-26 13:50:47 -03:00
Felipe Pena
aa31d7e1ef Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Fixed bug #63409 (php-dba function test fails on big-endian machine) patch by: tianhonglouis at gmail dot com
2013-06-26 13:50:43 -03:00
Felipe Pena
7e33b5d2fa - Fixed bug #63409 (php-dba function test fails on big-endian machine) patch by: tianhonglouis at gmail dot com 2013-06-26 13:50:37 -03:00
Felipe Pena
c743d0c9dc Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fixed test
2013-06-26 13:36:50 -03:00
Felipe Pena
32f11e4ee6 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Fixed test
2013-06-26 13:36:41 -03:00
Felipe Pena
f477ad22c2 - Fixed test 2013-06-26 13:36:36 -03:00
Andrey Hristov
793694b9d8 Merge branch 'PHP-5.5' 2013-06-26 16:51:42 +02:00
Andrey Hristov
781be5f1d7 Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
	NEWS
2013-06-26 16:50:08 +02:00
Andrey Hristov
b34e8d2e3e add new test 2013-06-26 16:44:26 +02:00
Yasuo Ohgaki
eeeb7a281a Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #65015 (pg_send_query does not flush send buffer) patch submitted by: adam at vektah dot net
2013-06-26 16:23:25 +09:00