mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-03 23:05:57 +08:00
Code Issues Packages Projects Releases Wiki Activity
80,924 Commits 501 Branches 1,382 Tags 827 MiB
4dc994571d
Commit Graph

34402 Commits

Author SHA1 Message Date
Tjerk Meesters
37a685ff2b More fixes for nodelist array access 
- testing for null property read
- no zval copying if the type is already long
- memory fix for master
 2014-10-12 12:47:58 +08:00
Leigh
63fd969300 Add 64 bit formats to pack() and unpack() 2014-10-09 21:02:42 +01:00
Tjerk Meesters
59f39dea66 Refactored DOMNodeList array dereferencing implementation 2014-10-09 23:07:12 +08:00
Tjerk Meesters
8a3b41cd39 Merge branch 'pr/846' into PHP-5.6 
* pr/846:
  DOMNodeList elements are accessible through array notation
 2014-10-09 15:55:10 +08:00
Tjerk Meesters
f92c9b3ced Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Updated NEWS for #68129
  Fixed bug #68129
 2014-10-09 08:24:05 +08:00
Tjerk Meesters
d0e51f5ce9 Fixed bug #68129 
Empty usernames and passwords are now treated differently from no username or password

For example, empty password:

    ftp://user:@example.org

Empty username:

    ftp://:password@example.org

Empty username and empty password

    ftp://:@example.org
 2014-10-09 08:21:30 +08:00
Keyur Govande
92f108801e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add to NEWS
  Fix for bug #68087 (ODBC not reading DATE columns correctly)
 2014-10-07 21:22:07 +00:00
Keyur Govande
df9078ea55 Fix for bug #68087 (ODBC not reading DATE columns correctly) 
Temporary variable indicating column field type ID should be
reset to default for loop iteration (i.e. every column in the
record set. The old buggy code made it persist across all columns
leading to invalid reads from the buffer, if for example a DATE
column was preceded by a VARCHAR column.
 2014-10-07 21:17:36 +00:00
Keyur Govande
bcda6c9392 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add to NEWS
  Fix for bug #68114 (Build fails on OS X due to undefined symbols)
 2014-10-07 21:08:18 +00:00
Keyur Govande
648673bffe Fix for bug #68114 (Build fails on OS X due to undefined symbols) 
gcc (i686-apple-darwin10-gcc-4.2.1) on OS X cannot link fixed-width
decimals and fails with undefined symbols errors like ___extendsddf.
If configure used gcc for compiling it would notice and mark the
feature HAVE_DECIMAL_FP_SUPPORT as unsupported.
But configure seems to use cc (i686-apple-darwin10-llvm-gcc-4.2)
instead, which doesn't support fixed-width decimals either, but the
code compiles and links just fine. I suspect it may have something
to do with the llvm backend printed in the version.
Lacking the time to debug this further, the patch fixes the issue by
checking the expected output when fixed-width decimal support is
present and correctly implemented.
 2014-10-07 20:58:43 +00:00
Leigh
aa679295e4 Merge branch 'PHP-5.6' of https://github.com/php/php-src into gmp-random 2014-10-07 14:25:44 +01:00
Johannes Schlüter
79ca53b62b Merge branch 'PHP-5.5' into PHP-5.6 2014-10-04 20:06:44 +02:00
Johannes Schlüter
b386991471 Fix accidental edit in previous commit 2014-10-04 20:06:02 +02:00
Johannes Schlüter
61d29990b4 Merge branch 'PHP-5.5' into PHP-5.6 2014-10-04 20:00:10 +02:00
Johannes Schlüter
136dd53ac2 Fix arginfo 2014-10-04 19:59:21 +02:00
Derick Rethans
0e5f475f5e Merge branch 'PHP-5.5' into PHP-5.6 2014-10-04 15:59:17 +01:00
Derick Rethans
0874ef624c Merge branch 'PHP-5.4' into PHP-5.5 2014-10-04 15:58:40 +01:00
Florian MARGAINE
046c345de5 DateTimeZone::getOffset() now accepts a DateTimeInterface 
Fixes #68062
 2014-10-04 15:58:24 +01:00
Remi Collet
3e6f176733 only no_NO.ISO-8859-1 have to be ignored 2014-10-01 10:14:14 +02:00
krakjoe
7cbd8f8b8a remove bogus locale use from test 2014-10-01 10:12:06 +02:00
Remi Collet
f584b67eaa Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  use $PHP_LIBDIR instread of "lib" in skel example
 2014-10-01 09:26:46 +02:00
Remi Collet
7319298ffe use $PHP_LIBDIR instread of "lib" in skel example 2014-10-01 09:26:21 +02:00
Anatol Belski
df4d559881 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix test filename
 2014-09-29 20:30:43 +02:00
Anatol Belski
7f1239232e fix test filename 2014-09-29 20:30:18 +02:00
Anatol Belski
cc3849f039 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  one more test to illustrate transfer of an arbitrary data amount throug pipes
 2014-09-29 20:19:31 +02:00
Anatol Belski
1a2a8c6d4e one more test to illustrate transfer of an arbitrary data amount throug pipes 2014-09-29 20:18:33 +02:00
Anatol Belski
70ff3ad7d1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix tests on linux
  better test cleanup
 2014-09-29 18:12:56 +02:00
Anatol Belski
859913f6d4 fix tests on linux 2014-09-29 18:12:25 +02:00
Anatol Belski
91d3cd8559 better test cleanup 
and even force the XFAIL to fail as it would take too long anyway, even if it passes
 2014-09-29 18:11:06 +02:00
Anatol Belski
87a37f4090 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #51800 proc_open on Windows hangs forever
 2014-09-29 16:27:33 +02:00
Anatol Belski
0c982798e0 Fixed bug #51800 proc_open on Windows hangs forever 
This loop can block for some minutes, theoretically. Practially
however, this is a 99% non issue for a normal use case. This is
required because read() is synchronous. The PHP streams API wants
to fill its internal buffers, therefore it might try to read some
more data than user has demanded. Also, for a case where we want
to read X bytes, but neither enough data nor EOF arrives, read()
will block until it could fill the buffer. If a counterpart station
runs slowly or delivers not all the data at once, read() would
still be waiting. If we quit too early, we possibly could loose
some data from the pipe. Thus it has to emulate the read()
behaviour, but obviously not completely, just to some grade.

Reading big data amount is for sure an issue on any platforms, it
depends on the pipe buffer size, which is controlled by the system.
On Windows, the buffer size seems to be way too small, which causes
buffer congestion and a dead lock. It is essential to read the pipe
descriptors simultaneously and possibly in the same order as the
opposite writes them.

Thus, this will work with smaller buffer data sizes passed through
pipes. As MSDN states, anonymous pipes don't support asynchronous
operations. Neither anonymous pipes do support select() as they are
not SOCKETs but file descriptors. Consequently - bigger data sizes
will need a better solution based on threads. However it is much
more expencive. Maybe a better solution could be exporting a part
of the internal doing as a userspace function which could perform
some kind of lookahead operation on the pipe descriptor.

This is just the first stone, depending on the user feedback we
might go for further improvements in this area.
 2014-09-29 16:24:34 +02:00
Stanislav Malyshev
a8e84b1b21 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Set an LDAP error code when failing ldap_bind due to null bytes
 2014-09-28 12:25:49 -07:00
Stanislav Malyshev
ef39f40445 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Set an LDAP error code when failing ldap_bind due to null bytes
 2014-09-28 12:25:24 -07:00
Matthew Daley
fcbe20d357 Set an LDAP error code when failing ldap_bind due to null bytes 
Some applications check a LDAP link's error code after seeing ldap_bind
fail due to a null byte bind attempt and hence incorrectly receive the
last set error code.

Fix by setting an LDAP error code before returning in this case.
 2014-09-28 12:23:52 -07:00
Florian MARGAINE
9469db9311 DOMNodeList elements are accessible through array notation 
Fixes #67949
 2014-09-27 01:27:46 +02:00
Derick Rethans
71c39612d5 Merge branch 'PHP-5.5' into PHP-5.6 2014-09-26 16:27:05 +01:00
Derick Rethans
5d299509b4 Merge branch 'PHP-5.4' into PHP-5.5 2014-09-26 16:27:00 +01:00
Derick Rethans
16e2d954fc - Updated to version 2014.8 (2014h) 2014-09-26 16:26:59 +01:00
Stanislav Malyshev
408b172017 Revert xp_ssl.c to the state of 5.4.32 due to regressions 2014-09-26 00:44:24 -07:00
Remi Collet
97cab239d7 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  Fixed bug #68103 Dupplicate entry in Reflection
 2014-09-26 09:06:51 +02:00
Remi Collet
efa7f87de4 Fixed bug #68103 Dupplicate entry in Reflection 
$ php -r '$r=new ReflectionExtension("pthreads"); print_r($r->getClassNames());'
Array
(
    [0] => Threaded
    [1] => stackable
    [2] => Thread
    [3] => Worker
    [4] => Mutex
    [5] => Cond
    [6] => Collectable
    [7] => Pool
)

In getClasses() output, it is possible to compare key (ex "stackable")
with $obj->name (ex "Threaded") to detect class alias.

...
    [Threaded] => ReflectionClass Object
        (
            [name] => Threaded
        )
    [stackable] => ReflectionClass Object
        (
            [name] => Threaded
        )
...
 2014-09-26 08:56:42 +02:00
Leigh
adf8f0f284 Address issues raised by @nikic 
- Thread safety on rand init function.
 - Ret false on validation failure
 - Add _dep of temp_a to temp_b
 - Special case int sized min values
 - More tests!
 2014-09-24 22:01:09 +01:00
Ferenc Kovacs
d27f3e7b64 update the certificate used for the test, as it expired recently 2014-09-24 13:40:52 +02:00
Remi Collet
0d776ef87b Fix bug #68074 Allow to use system cipher list instead of hardcoded value 2014-09-24 10:34:55 +02:00
Leigh
3e9a31748d Make sure min < max 2014-09-24 07:56:46 +01:00
Leigh
acd7fcf55f Mersenne Twister was added in GMP 4.2 2014-09-23 23:16:26 +01:00
Leigh
31e27fc89a Add test files 2014-09-23 22:54:40 +01:00
Leigh
831bb9260c Add gmp_random_bits(bits) and gmp_random_range(min, max) 2014-09-23 22:12:23 +01:00
Leigh
3d6d863ccb Change GMPs default PRNG to Mersenne Twister 
Since we don't allow users to seed the RNG, there is no BC issue with changing the generator.
 2014-09-23 19:51:56 +01:00
Ard Biesheuvel
8312836c74 Merge branch 'PHP-5.5' into PHP-5.6 2014-09-20 16:42:12 -07:00
Ard Biesheuvel
7958793342 Merge branch 'PHP-5.4' into PHP-5.5 2014-09-20 16:40:02 -07:00
Ard Biesheuvel
e64da8c20d Fixed bug #66242 (don't assume char is signed) 
This fixes a bug in libmagic where a cast to 'char' is assumed to result
in sign extension to occur. However, unqualified 'char' is unsigned on
architectures such as ARM, so the cast needs to be to 'signed char'
explicitly.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
 2014-09-20 16:39:48 -07:00
Anatol Belski
6213d9fc91 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix possible array underflow
 2014-09-19 20:13:46 +02:00
Anatol Belski
5d9403f56c fix possible array underflow 
there are multiple issues with this code

- php_stream_read() returns an unsigned val, so is >= 0
- if it read less than sizeof(a) bytes, the function operates on garbage
- result->channels is an unsigned val, so >= 0
 2014-09-19 20:12:24 +02:00
Matteo Beccati
24ed330a22 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed freetype test on multiple environments
 2014-09-16 10:22:49 +02:00
Matteo Beccati
b8470e19e4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed freetype test on multiple environments
 2014-09-16 10:22:34 +02:00
Matteo Beccati
00525b824a Fixed freetype test on multiple environments 
Some environments, apparently regardless to the freetype version, output 155, while others 156. I guess we can accept both ;)

This reverts commit 592df89027.
 2014-09-16 10:19:29 +02:00
Anatol Belski
13280a9e36 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  reflect in the test that GSS-Negotiate is deprecated since libcurl 7.38.0
 2014-09-11 23:31:16 +02:00
Anatol Belski
69ea7f9509 reflect in the test that GSS-Negotiate is deprecated since libcurl 7.38.0 2014-09-11 23:30:01 +02:00
Anatol Belski
0b89bb83ba Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix precision when fetching float through mysqlnd
 2014-09-10 19:31:59 +02:00
Anatol Belski
dff820cea3 fix precision when fetching float through mysqlnd 
fixes failing ext/mysqli/tests/010.phpt
 2014-09-10 19:29:11 +02:00
Matteo Beccati
0b648a424f FR #67990 - Added nowait argument to sem_acquire 2014-09-10 07:31:25 +02:00
Daniel Lowrey
edb2799333 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Bug #41631: Fix regression from first attempt (6569db8)
  Bug #67965: Fix blocking behavior in non-blocking crypto streams
 2014-09-09 10:24:40 -06:00
Daniel Lowrey
bf2f80b223 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Bug #41631: Fix regression from first attempt (6569db8)
  Bug #67965: Fix blocking behavior in non-blocking crypto streams
 2014-09-09 09:27:20 -06:00
Daniel Lowrey
372844918a Bug #41631: Fix regression from first attempt (6569db8) 2014-09-09 09:01:42 -06:00
Daniel Lowrey
f86b2193a4 Bug #67965: Fix blocking behavior in non-blocking crypto streams 2014-09-09 07:37:57 -06:00
Adam Harvey
0cbfdc9df5 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #67972 (SessionHandler Invalid memory read create_sid()).
  Update LSAPI to 6.7, added support for 'filter_input'. Fixed a crash in CLI mode.
  5.5.18 now

Conflicts:
	configure.in
	main/php_version.h
 2014-09-08 19:28:15 +00:00
Adam Harvey
bc44eb6172 Fix bug #67972 (SessionHandler Invalid memory read create_sid()). 
SessionHandler::create_sid() didn't check if PS(default_mod) was initialised
before attempting to call its create_sid() handler.
 2014-09-08 19:25:14 +00:00
Nikita Popov
03797a73b2 Split GMP tests testing multiple functions 
Also drop dummy test
 2014-09-04 21:18:37 +02:00
Nikita Popov
9586b15229 Give proper names to GMP test files 2014-09-04 21:10:41 +02:00
Nikita Popov
15c139b99a Throw warnings when using zero modulus in gmp_powm 
Also fixes a leak in this case.
 2014-09-04 20:55:09 +02:00
Nikita Popov
f10d194c8c Add GMP tests for some uncovered branches 2014-09-04 20:03:29 +02:00
Tjerk Meesters
fa08ff9245 Fixed #67955: SoapClient prepends 0-byte to cookie names 2014-09-04 06:58:04 +08:00
Philip Hofstetter
9befa8c5f7 fix bug #67955 
this fixes a regression from 6c2a806820.

smart_str_appendl is expecting the length as the length of the string,
but key_length is the byte length of the key, including the 0
terminator.

As such, the cookie name appeneded to the header would now also include
the 0 terminator of the key name which then would be sent to the server.
 2014-09-03 14:35:40 +02:00
Matteo Beccati
627704b38e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed test with freetype >= 2.4.12
 2014-09-03 09:45:09 +02:00
Matteo Beccati
72c9b0e12b Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed test with freetype >= 2.4.12
 2014-09-03 09:44:59 +02:00
Matteo Beccati
592df89027 Fixed test with freetype >= 2.4.12 2014-09-03 09:43:29 +02:00
Nikita Popov
834daa455b Fixed bug #50175 
0x and 0b prefix is now only handled if either no base is given
or if the base is 16 (0x) or 2 (0b). Always handling it is incorrect
because 0x and 0b are perfectly valid numbers in other bases.
 2014-09-02 19:04:55 +02:00
Nikita Popov
7533243f0c Fix C89 build and small cleanup 2014-09-02 18:52:13 +02:00
Leigh
47d630e7f0 Implement gmp_import() and gmp_export() 2014-09-02 14:19:18 +02:00
Tjerk Meesters
f54451cf39 Make DOMNode::textContent writeable 2014-09-02 06:34:18 +08:00
Derick Rethans
f89b7ec389 Merge branch 'PHP-5.5' into PHP-5.6 2014-09-01 16:40:54 +01:00
Derick Rethans
21446cd7b6 Merge branch 'PHP-5.4' into PHP-5.5 2014-09-01 16:40:50 +01:00
Derick Rethans
e665a07ab9 - Updated to version 2014.7 (2014g) 2014-09-01 16:40:49 +01:00
Tjerk Meesters
1bf996b324 Added test case 2014-09-01 22:04:25 +08:00
Tjerk Meesters
5270ee1aef Making ini parser typed 
- Added ZEND_INI_SCANNER_TYPED mode for parse_ini_string() and parse_ini_file()
- Added NULL_NULL token to separate it from BOOL_FALSE and BOOL_TRUE
- Added zend_ini_copy_typed_value() function for zval initialisation
- Updated RETURN_TOKEN() to observe scanner_mode
 2014-09-01 22:04:06 +08:00
Anatol Belski
c301467f9b Fixed bug #67731 finfo::file() returns invalid mime type for binary files 2014-08-30 04:04:42 +02:00
Nikita Popov
fc5f931663 Fix bug #67917 (gmp compound assignment operator leak) 2014-08-27 22:16:20 +02:00
Chris Wright
db03216e62 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix stream_select() issue with OpenSSL buffer
 2014-08-27 16:06:28 +01:00
Chris Wright
30a73658c6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix stream_select() issue with OpenSSL buffer

Conflicts:
	ext/openssl/xp_ssl.c
 2014-08-27 16:01:18 +01:00
Chris Wright
32be79dcfa Fix stream_select() issue with OpenSSL buffer 
Ensure data from OpenSSL internal buffer has been
transfered to PHP stream buffer before a select()
emulation operation is performed

Addresses bug #65137
https://bugs.php.net/bug.php?id=65137

Conflicts:
	ext/openssl/xp_ssl.c
 2014-08-27 13:25:50 +01:00
Anatol Belski
4d667eeaf3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fixed DBG_INF macro name
 2014-08-27 12:11:35 +02:00
Anatol Belski
7fac56e072 fixed DBG_INF macro name 2014-08-27 12:10:35 +02:00
Daniel Lowrey
546a32e2b3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Bug #67850: Build when OpenSSL compiled without SSLv3 support

Conflicts:
	ext/openssl/xp_ssl.c
 2014-08-25 18:16:38 +02:00
Daniel Lowrey
640214701c Bug #67850: Build when OpenSSL compiled without SSLv3 support 2014-08-25 17:28:09 +02:00
Lior Kaplan
6e87b01e95 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>
 2014-08-25 00:30:40 +03:00
Lior Kaplan
c8b3bce407 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>
 2014-08-25 00:30:01 +03:00
Lior Kaplan
bda1cc6946 Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk> 2014-08-25 00:29:05 +03:00
Ferenc Kovacs
86966a092b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  this test depends on the simplexml ext, not just on xml
 2014-08-24 00:09:31 +02:00
Ferenc Kovacs
a90d05a430 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  this test depends on the simplexml ext, not just on xml
 2014-08-24 00:09:00 +02:00
Ferenc Kovacs
cb41a7bad1 this test depends on the simplexml ext, not just on xml 2014-08-24 00:08:09 +02:00
Tjerk Meesters
ce9bdae33f Fixed #67694: Regression in session_regenerate_id() 2014-08-23 09:18:02 +08:00
Michael Wallner
3b82c4e520 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix bug #67865
  updated NEWS to fit last release
  NEWS
  Fix bug #67878 program_prefix not honoured in man pages
 2014-08-21 22:45:33 +02:00
Michael Wallner
c4fb183b9f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix bug #67865
 2014-08-21 22:43:25 +02:00
Michael Wallner
54fbbded37 fix bug #67865 2014-08-21 22:41:36 +02:00
Stanislav Malyshev
6da2a977fc fix test 2014-08-20 14:44:25 -07:00
Stanislav Malyshev
2dfabd8b51 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix test
 2014-08-20 14:43:22 -07:00
Stanislav Malyshev
6424bf659d fix test 2014-08-20 14:42:48 -07:00
Anatol Belski
20941b71aa fixed variable corruption under win x64 2014-08-20 15:08:52 +02:00
Sara Golemon
a309dda777 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Switch use of strtok() to gd_strtok_r()
 2014-08-19 13:22:14 -07:00
Sara Golemon
ac4569621d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Switch use of strtok() to gd_strtok_r()

Conflicts:
	NEWS
 2014-08-19 13:17:56 -07:00
Sara Golemon
cbe1597b74 Switch use of strtok() to gd_strtok_r() 
strtok() is not thread safe, so this will potentially break in
very bad ways if used in ZTS mode.

I'm not sure why gd_strtok_r() exists since it seems to do the
same thing as strtok_r(), but I'll assume it's a portability
decision and do as the Romans do.
 2014-08-19 13:16:44 -07:00
Stanislav Malyshev
fae17a00f5 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  5.4.32
  fix potentially missing NUL termination
  Fix bug #67730 - Null byte injection possible with imagexxx functions
  Fixed bug #67717 - segfault in dns_get_record
  Fix bug #67716 - Segfault in cdf.c
  5.4.32 RC1
 2014-08-19 01:34:25 -07:00
Stanislav Malyshev
b278be894f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  5.4.32
  fix potentially missing NUL termination
  Fix bug #67730 - Null byte injection possible with imagexxx functions
  Fixed bug #67717 - segfault in dns_get_record
  Fix bug #67716 - Segfault in cdf.c
  5.4.32 RC1
 2014-08-19 01:34:09 -07:00
Stanislav Malyshev
5a7039035c 5.4.32 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (Darwin)
 
 iF4EABEIAAYFAlPzCaMACgkQL3lWvF2gS10pnwD9GYeG82QTI20oVqzQ4dVF+yks
 xC5ph0RvUVXbJy8ADn4A/2Of7Q520LQYkxZHN0JDTb3EBaTvhG5sF6Yo1gTpJPKS
 =NoE4
 -----END PGP SIGNATURE-----

Merge tag 'PHP-5.4.32' into PHP-5.4

5.4.32

* tag 'PHP-5.4.32':
  5.4.32
  fix potentially missing NUL termination
  Fix bug #67730 - Null byte injection possible with imagexxx functions
  Fixed bug #67717 - segfault in dns_get_record
  Fix bug #67716 - Segfault in cdf.c
  5.4.32 RC1

Conflicts:
	configure.in
	main/php_version.h
 2014-08-19 01:33:45 -07:00
Remi Collet
230804b08d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  NEWS
  Fixed Sec Bug #67717 segfault in dns_get_record CVE-2014-3597
 2014-08-19 08:41:14 +02:00
Remi Collet
5e9e0a2c74 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fixed Sec Bug #67717 segfault in dns_get_record CVE-2014-3597
 2014-08-19 08:40:30 +02:00
Remi Collet
2fefae4771 Fixed Sec Bug #67717 segfault in dns_get_record CVE-2014-3597 
Incomplete fix for CVE-2014-4049

Check possible buffer overflow
- pass real buffer end to dn_expand calls
- check buffer len before each read
 2014-08-19 08:33:49 +02:00
Stanislav Malyshev
706aefb781 Fix bug #67730 - Null byte injection possible with imagexxx functions 2014-08-18 22:49:10 -07:00
Stanislav Malyshev
529da0f74c Fixed bug #67717 - segfault in dns_get_record 2014-08-18 22:37:25 -07:00
Derick Rethans
77cc6aabb7 Merge branch 'PHP-5.5' into PHP-5.6 2014-08-18 20:27:44 +01:00
Derick Rethans
36d05d75c8 Fixed bug #67109: First uppercase letter breaks date string parsing. 2014-08-18 18:41:50 +01:00
Derick Rethans
2b9af967fb Fixed bug #66985: Some timezones are no longer valid in PHP 5.5.10. 2014-08-18 18:41:50 +01:00
Lior Kaplan
f1d0e50ea8 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Correct typo in comments: 'initialized'
 2014-08-17 21:34:03 +03:00
Lior Kaplan
fac08a960b Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Correct typo in comments: 'initialized'
 2014-08-17 21:33:41 +03:00
Lior Kaplan
1504f7d630 Correct typo in comments: 'initialized' 2014-08-17 21:32:53 +03:00
Lior Kaplan
56d02d564e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  typofixes
 2014-08-17 15:51:15 +03:00
Lior Kaplan
be2128c805 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  typofixes
 2014-08-17 15:48:22 +03:00
Veres Lajos
3f42f2f5d1 typofixes 2014-08-17 15:44:02 +03:00
Keyur Govande
032dee4982 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update NEWS
  Fix another failing test
  Add NEWS
  Fix failing tests
  Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)

Conflicts:
	ext/mysqli/tests/mysqli_change_user.phpt
 2014-08-15 23:47:06 +00:00
Keyur Govande
48dc203408 Fix another failing test 2014-08-15 23:26:21 +00:00
Keyur Govande
7c4b5d9187 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add NEWS
  Fix failing tests
  Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)

Conflicts:
	ext/mysqli/tests/table.inc
 2014-08-15 23:13:36 +00:00
Keyur Govande
7bfe9bf951 Merge branch 'pull-request/772' into PHP-5.4 
* pull-request/772:
  Fix failing tests
  Patch for bug #67839 (mysqli does not handle 4-byte floats correctly)

Before the patch, a value of 9.99 in a FLOAT column came out of mysqli
as 9.9998998641968. This is because it would naively cast a 4-byte float
into PHP's internal 8-byte double.
To fix this, with GCC we use the built-in decimal support to "up-convert"
the 4-byte float to a 8-byte double.
When that is not available, we fall back to converting the float
to a string and then converting the string to a double. This mimics
what MySQL does.
 2014-08-15 23:06:55 +00:00
Remi Collet
7ba1409a1a Fix bug #67716 - Segfault in cdf.c 2014-08-14 17:44:19 -07:00
Stanislav Malyshev
23122ba69c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #67716 - Segfault in cdf.c
  Fix bug #67716 - Segfault in cdf.c
 2014-08-14 17:22:06 -07:00
Stanislav Malyshev
3468f03b6f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #67716 - Segfault in cdf.c
 2014-08-14 17:21:29 -07:00
Remi Collet
35f32637b0 Fix bug #67716 - Segfault in cdf.c 2014-08-14 17:21:20 -07:00
Remi Collet
49387b31cf Fix bug #67716 - Segfault in cdf.c 2014-08-14 17:19:03 -07:00
Stanislav Malyshev
ff4cf1a838 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix test
 2014-08-14 17:07:45 -07:00
Stanislav Malyshev
eab42649ab fix test 2014-08-14 17:07:28 -07:00
Stanislav Malyshev
008330e5b3 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  split the glob() test to test different basedir
 2014-08-14 17:05:03 -07:00
Anatol Belski
b7cd099ae0 split the glob() test to test different basedir 2014-08-14 17:04:51 -07:00
Stanislav Malyshev
4185633207 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed glob() edge case on windows, ref bug #47358
  - fix bug #47358, glob returns error, should be empty array()
 2014-08-14 17:00:36 -07:00
Anatol Belski
ad492ca932 fixed glob() edge case on windows, ref bug #47358 2014-08-14 16:58:16 -07:00
Pierre Joye
481c4715d4 - fix bug #47358, glob returns error, should be empty array() 
Conflicts:
	ext/standard/dir.c
 2014-08-14 16:56:22 -07:00
Keyur Govande
4e2c01617f Fix failing tests 2014-08-14 18:20:26 +00:00
Keyur Govande
c044164a96 Patch for bug #67839 (mysqli does not handle 4-byte floats correctly) 
Before the patch, a value of 9.99 in a FLOAT column came out of mysqli
as 9.9998998641968. This is because it would naively cast a 4-byte float
into PHP's internal 8-byte double.
To fix this, with GCC we use the built-in decimal support to "up-convert"
the 4-byte float to a 8-byte double.
When that is not available, we fall back to converting the float
to a string and then converting the string to a double. This mimics
what MySQL does.
 2014-08-14 18:19:56 +00:00
Tjerk Meesters
7fbc99e390 Some changes were lost in the merge commit of #66091 2014-08-13 20:57:10 +08:00
Tjerk Meesters
4b85f1d46a Fixed #66091 2014-08-13 20:24:43 +08:00
Tjerk Meesters
4647016abe Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Updated NEWS for #66091
  Fixed #66091

Conflicts:
	ext/date/php_date.c
 2014-08-13 20:20:10 +08:00