clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 23:36:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,308 Commits 494 Branches 1,367 Tags 809 MiB
10c547018f
Commit Graph

32255 Commits

Author SHA1 Message Date
Andrey Hristov
a5d2854bdc Merge branch 'PHP-5.5' 2013-07-08 20:26:04 +02:00
Andrey Hristov
3dd5f4ae4c Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	NEWS
 2013-07-08 20:24:58 +02:00
Andrey Hristov
9fc38183b7 Fixed segfault in mysqlnd when doing long prepare 2013-07-08 20:23:32 +02:00
Yasuo Ohgaki
870d238b06 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Added warning for hex2bin() when input is invalid string
  Update NEWS
 2013-07-08 19:15:04 +09:00
Yasuo Ohgaki
bde0f1318a Added warning for hex2bin() when input is invalid string 2013-07-08 19:14:45 +09:00
Yasuo Ohgaki
4fd1e24ee5 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Add warning to pg_unescape_bytea() when invalid parameter is passed
 2013-07-08 18:53:12 +09:00
Yasuo Ohgaki
2bc8271b29 Add warning to pg_unescape_bytea() when invalid parameter is passed 2013-07-08 18:51:37 +09:00
Xinchen Hui
11b757d53e Merge branch 'PHP-5.5' 2013-07-08 11:21:54 +08:00
Ben Ramsey
d1c261d7f8 array_column: Changing integer in test output to use %d 2013-07-06 20:50:34 +00:00
Rob Richards
b955dbecfb Merge branch 'PHP-5.5' 
# By Nuno Lopes (2) and Rob Richards (1)
* PHP-5.5:
  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:01:31 -04:00
Rob Richards
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
Rob Richards
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
Rob Richards
7d163e8a08 truncate results at depth of 255 to prevent corruption 2013-07-06 07:53:07 -04:00
Anatol Belski
675beb06a6 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Extended the test for bug #65184
 2013-07-03 22:53:34 +02:00
Anatol Belski
332e46b3aa Extended the test for bug #65184 2013-07-03 22:52:51 +02:00
Felipe Pena
0107b2afe8 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - Fixed build on FreeTDS 0.82
 2013-07-03 15:04:30 -03:00
Felipe Pena
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
Felipe Pena
7549beb102 - Fixed build on FreeTDS 0.82 2013-07-03 15:02:03 -03:00
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
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
Yasuo Ohgaki
6be36cc381 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #65015 (pg_send_query does not flush send buffer) patch submitted by: adam at vektah dot net
 2013-06-26 16:19:31 +09:00
Yasuo Ohgaki
6c8cef3ca4 Fixed bug #65015 (pg_send_query does not flush send buffer) patch submitted by: adam at vektah dot net 2013-06-26 16:17:57 +09:00
Felipe Pena
802a25e0c9 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - Fixed typo on condition
 2013-06-25 21:53:42 -03:00
Felipe Pena
623386d799 - Fixed typo on condition 2013-06-25 21:53:20 -03:00
Felipe Pena
509e89448e Merge branch 'PHP-5.5' 
* PHP-5.5:
  - Fixed bug #62475 (variant_* functions causes crash when null given as an argument)
  Update NEWS
  Update NEWS
  - BFN
 2013-06-25 21:40:30 -03:00
Felipe Pena
fba44be828 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #62475 (variant_* functions causes crash when null given as an argument)
  Update NEWS
  - BFN
 2013-06-25 21:40:24 -03:00
Felipe Pena
4289696828 - Fixed bug #62475 (variant_* functions causes crash when null given as an argument) 2013-06-25 21:36:50 -03:00
Felipe Pena
83bc4fb40a Merge branch 'PHP-5.5' 
* PHP-5.5:
  - Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
  - BFN
 2013-06-25 21:19:06 -03:00
Felipe Pena
f5bf90ef34 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
  - BFN
 2013-06-25 21:18:34 -03:00
Felipe Pena
04db57066d - Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com 2013-06-25 21:18:09 -03:00
Felipe Pena
2ab53f4b5e Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4 2013-06-25 18:01:46 -03:00
Felipe Pena
b78f129a4a Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5 2013-06-25 18:01:40 -03:00
Felipe Pena
bce86874f6 Merge branch 'master' of git.php.net:/php-src 2013-06-25 18:01:32 -03:00
Felipe Pena
f0823ac493 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
  - BFN
 2013-06-25 18:00:47 -03:00
Felipe Pena
adb116dd48 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
  - BFN
 2013-06-25 18:00:42 -03:00
Felipe Pena
41b73e4cee - Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com 2013-06-25 18:00:33 -03:00
Christopher Jones
53ec065077 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Minium changes to allow PDO_OCI to build with Oracle Database 12c libraries. (note OCI8 already builds with Oracle Database 12c)
 2013-06-25 12:00:56 -07:00
Christopher Jones
ec7ac71b52 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Minium changes to allow PDO_OCI to build with Oracle Database 12c libraries. (note OCI8 already builds with Oracle Database 12c)
 2013-06-25 12:00:24 -07:00
Christopher Jones
423b132a7a Minium changes to allow PDO_OCI to build with Oracle Database 12c libraries. 
(note OCI8 already builds with Oracle Database 12c)
 2013-06-25 11:55:41 -07:00
Xinchen Hui
d99a76ca96 Merge branch 'PHP-5.5' 2013-06-25 13:48:54 +08:00
Xinchen Hui
157ccaf507 Fixed bug #64827 Segfault in zval_mark_grey (zend_gc.c) 
I can not get a reproduce script since the context is very strict.

Of course I will try to make one, but for now, I just commit this first.
 2013-06-25 13:47:50 +08:00
Xinchen Hui
d8374c5590 Merge branch 'PHP-5.5' 2013-06-25 13:40:19 +08:00
Xinchen Hui
9d9ec2a90e Merge branch 'PHP-5.4' into PHP-5.5 2013-06-25 13:38:50 +08:00
Xinchen Hui
38eb909d06 Fixed Bug #61828 (Memleak when calling Directory(Recursive)Iterator/Spl(Temp)FileObject ctor twice) 2013-06-25 13:38:27 +08:00
Felipe Pena
ba3278d9e6 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - Fixed bug #61594 (ext/session/mod_mm.c: missing free of ps_mm_instance) patch by: jlawall at hotmail dot com
  - BFN
 2013-06-24 16:50:19 -03:00
Felipe Pena
ff292d619c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #61594 (ext/session/mod_mm.c: missing free of ps_mm_instance) patch by: jlawall at hotmail dot com
  - BFN
 2013-06-24 16:49:22 -03:00
Felipe Pena
982c11573d - Fixed bug #61594 (ext/session/mod_mm.c: missing free of ps_mm_instance) patch by: jlawall at hotmail dot com 2013-06-24 16:49:15 -03:00
Felipe Pena
33472f78f9 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - Fixed bug #61387 (NULL valued anonymous column causes segfault in odbc_fetch_array) patch by: Brandon Kirsch
 2013-06-24 14:48:28 -03:00
Felipe Pena
4b41959f9e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #61387 (NULL valued anonymous column causes segfault in odbc_fetch_array) patch by: Brandon Kirsch
 2013-06-24 14:47:40 -03:00
Felipe Pena
8776555d7a - Fixed bug #61387 (NULL valued anonymous column causes segfault in odbc_fetch_array) patch by: Brandon Kirsch 2013-06-24 14:43:35 -03:00
Remi Collet
8e4e38aaee Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix imagecreatefromwebp and imagewebp protos
 2013-06-24 11:15:56 +02:00
Remi Collet
9da4985bf2 fix imagecreatefromwebp and imagewebp protos 2013-06-24 11:15:50 +02:00
Remi Collet
8c694401bb Merge branch 'PHP-5.5' 
* PHP-5.5:
  Use same logic to load WebP image that other formats
 2013-06-24 11:11:02 +02:00
Remi Collet
8075f1f4a3 Use same logic to load WebP image that other formats 2013-06-24 11:10:52 +02:00
Remi Collet
6c56d785ae Merge branch 'PHP-5.5' 
* PHP-5.5:
  Upstream fix from https://bitbucket.org/libgd/gd-libgd/issue/75
 2013-06-24 11:04:10 +02:00
Remi Collet
b4632d0c12 Upstream fix from https://bitbucket.org/libgd/gd-libgd/issue/75 2013-06-24 11:03:12 +02:00
Dmitry Stogov
0c9de2d94b Merge branch 'PHP-5.5' 
* PHP-5.5:
  OPcache must be compatible with LiteSpeed SAPI

Conflicts:
	NEWS
 2013-06-24 12:01:58 +04:00
Dmitry Stogov
f49b27e166 OPcache must be compatible with LiteSpeed SAPI 2013-06-24 11:59:50 +04:00
Stanislav Malyshev
e3d625bc4e small optimization 2013-06-23 23:52:28 -07:00
Stanislav Malyshev
91cc70c430 Merge branch 'PHP-5.5' 
* PHP-5.5:
  seems to be working fine for me on 32-bit
 2013-06-23 23:38:15 -07:00
Stanislav Malyshev
ae5a09b47d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  seems to be working fine for me on 32-bit
 2013-06-23 23:37:10 -07:00
Stanislav Malyshev
a0d48e01ed seems to be working fine for me on 32-bit 2013-06-23 23:36:43 -07:00
Stanislav Malyshev
8aba119f55 fix bug #61860: use USearch for searches, it does the right thing 2013-06-23 23:24:12 -07:00
Stanislav Malyshev
30227f7a59 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix bug #62759: Buggy grapheme_substr() on edge case
 2013-06-23 21:27:20 -07:00
Stanislav Malyshev
9872835cf3 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #62759: Buggy grapheme_substr() on edge case
 2013-06-23 21:27:08 -07:00
Stanislav Malyshev
860a5c4b01 Fix bug #62759: Buggy grapheme_substr() on edge case 2013-06-23 21:26:16 -07:00
Stanislav Malyshev
46c46921b1 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Require second parameter of imagecrop()
 2013-06-23 20:30:03 -07:00
Jakub Vrana
e1acaea4f1 Require second parameter of imagecrop() 2013-06-23 20:29:54 -07:00
Stanislav Malyshev
e02b41d25c Merge branch 'PHP-5.5' 
* PHP-5.5:
  Implements feature Bug #63472 ability to set SO_BINDTODEVICE on socket.
 2013-06-23 15:26:30 -07:00
Stanislav Malyshev
1beb24bd6f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Implements feature Bug #63472 ability to set SO_BINDTODEVICE on socket.

Conflicts:
	ext/sockets/sockets.c
 2013-06-23 15:26:14 -07:00
Damjan Cvetko
a0b4348abc Implements feature Bug #63472 ability to set SO_BINDTODEVICE on socket. 2013-06-23 15:20:54 -07:00
Remi Collet
20dbd27108 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed Bug #65060 imagecreatefrom... crashes with user streams Fixed Bug #65084 imagecreatefromjpeg fails with URL
 2013-06-21 14:11:33 +02:00
Remi Collet
fc898ee0f9 Fixed Bug #65060 imagecreatefrom... crashes with user streams 
Fixed Bug #65084 imagecreatefromjpeg fails with URL

Regression introduced in 8a90aad (drop of USE_GD_IOCTX)
Secure with php_stream_can_cast to avoid segfault in php_stream_cast.
(encountered when imagecreatefromxpm with URL)
 2013-06-21 14:11:04 +02:00
Pierre Joye
4718f892cb Merge branch 'master' of git.php.net:php-src 2013-06-20 22:34:04 +02:00
Pierre Joye
a1d0a869be Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix #65070, bgcolor does not use the same format as the input image with imagerotate
  fix #65070, bgcolor does not use the same format as the input image with imagerotate
  Fix the spelling of the php_cli_server_http_response_status_code_pair typedef.
  Change the search in get_status_string() to correctly handle unknown codes.
  Update git rules (5.5 is stable, 5.3 sec only)
  skip test for bug #64936 when tokenizer not built
  Bump version
  Update credits
  Merge NEWS from PHP 5.4 branch
  Reorder NEWS for PHP 5.5.0 final

Conflicts:
	configure.in
	ext/gd/libgd/gd_interpolation.c
	main/php_version.h
 2013-06-20 22:32:52 +02:00
Pierre Joye
876b474c7d Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-06-20 22:19:53 +02:00
Pierre Joye
07e52857b5 fix #65070, bgcolor does not use the same format as the input image with imagerotate 2013-06-20 22:19:33 +02:00
Remi Collet
a964c5def8 Merge branch 'PHP-5.5' 
* PHP-5.5:
  skip test for bug #64936 when tokenizer not built
 2013-06-20 08:43:11 +02:00
Remi Collet
60afd3fce4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  skip test for bug #64936 when tokenizer not built
 2013-06-20 08:42:30 +02:00
Remi Collet
9be591bdb5 skip test for bug #64936 when tokenizer not built 2013-06-20 08:42:07 +02:00
David Soria Parra
c1b8fbc112 Update credits 2013-06-19 22:03:18 +02:00
Anatol Belski
d9f538bc68 Merge branch 'PHP-5.5' 
* PHP-5.5:
  added some tests based on bug #64395
 2013-06-19 16:25:08 +02:00
Anatol Belski
2873b5b6eb added some tests based on bug #64395 2013-06-19 16:24:30 +02:00
Remi Collet
04b2f8d53e Merge branch 'PHP-5.5' 
* PHP-5.5:
  Related to bug #65047 (Test skip on client / server version)
 2013-06-19 12:27:12 +02:00
Remi Collet
fb68e0fe63 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Related to bug #65047 (Test skip on client / server version)
 2013-06-19 12:26:53 +02:00
Remi Collet
67bde2f8ac Related to bug #65047 (Test skip on client / server version) 
bug46274.phpt and bug46274_2.phpt
Make query silent (when server don't know bytea_output option)

bug_49985.phpt
Make result "locale" independent
 2013-06-19 12:26:21 +02:00
Matteo Beccati
77032bcd9c Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #65047 (Test skip on client / server version)
  Remove broken client version checking
  Clean up leftover file after the test
 2013-06-19 11:53:21 +02:00
Matteo Beccati
9b8259cdfa Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #65047 (Test skip on client / server version)
  Remove broken client version checking
  Clean up leftover file after the test
 2013-06-19 11:53:05 +02:00
Matteo Beccati
c666239265 Fixed bug #65047 (Test skip on client / server version) 2013-06-19 11:48:03 +02:00
Matteo Beccati
25e9aa6b0a Remove broken client version checking 2013-06-19 11:48:03 +02:00
Matteo Beccati
5edd530511 Clean up leftover file after the test 2013-06-19 11:48:03 +02:00
Xinchen Hui
ce1cb1f7a6 Merge branch 'PHP-5.5' 2013-06-19 11:17:55 +08:00
Xinchen Hui
bb9928c343 Merge branch 'PHP-5.4' into PHP-5.5 2013-06-19 11:17:44 +08:00
Xinchen Hui
2ce4bd7f2d Fix test typo 2013-06-19 11:15:52 +08:00
Nikita Popov
7713b8c2ac GMP improvements 
As per RFC https://wiki.php.net/rfc/operator_overloading_gmp
 2013-06-17 17:59:12 +02:00
Stanislav Malyshev
1143f58a70 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Merge branch 'pull-request/320'
  Merge branch 'pull-request/320'
 2013-06-17 01:07:28 -07:00