clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 03:17:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,862 Commits 491 Branches 1,363 Tags 846 MiB
55ee543e2f
Commit Graph

32017 Commits

Author SHA1 Message Date
Yasuo Ohgaki
f718684a6c Fixed bug #62978. pg_select()/etc may allow SQL injection when table name is user parameter, users are able to control table names. 2013-08-05 18:23:15 +09:00
Stanislav Malyshev
6f73a0c00f Merge branch 'pr368' into PHP-5.5 
* pr368:
  fix crash, enable session_id and fix test
  Strict session. Detect session id collision
  Strict session
 2013-08-04 20:00:28 -07:00
Stanislav Malyshev
7d3fa7d8b6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  First fixes for a 64bit compatible ftp extension
 2013-08-04 19:36:01 -07:00
Andreas Streichardt
a93a462dce First fixes for a 64bit compatible ftp extension 2013-08-04 19:31:30 -07:00
Stanislav Malyshev
e4f9619fad fix compiler warning, use longs for hashes 2013-08-04 18:04:45 -07:00
Stanislav Malyshev
b80d73ce15 fix crash, enable session_id and fix test 2013-08-04 17:43:20 -07:00
Yasuo Ohgaki
82b0e8be99 Strict session. Detect session id collision 2013-08-04 16:36:53 -07:00
Yasuo Ohgaki
25e8fcc88f Strict session 2013-08-04 16:36:45 -07:00
Stanislav Malyshev
c793a65690 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  non living code related typo fixes

Conflicts:
	Zend/zend_compile.c
 2013-08-04 16:06:24 -07:00
Veres Lajos
8d86597d73 non living code related typo fixes 2013-08-04 16:05:36 -07:00
Rasmus Lerdorf
626d96ab6d This doesn't fail in 5.5 anymore 2013-08-03 12:14:47 -04:00
Rasmus Lerdorf
f17f596b27 Merge commit 'a03f094' into PHP-5.5 
* commit 'a03f094':
  We shouldn't load any local ini files for these tests
 2013-08-02 16:23:44 -04:00
Rasmus Lerdorf
a03f0943ca We shouldn't load any local ini files for these tests 2013-08-02 16:23:18 -04:00
Rasmus Lerdorf
d24f31c65e Merge commit 'd60e168' into PHP-5.5 
* commit 'd60e168':
  pcre_quote? No such thing. How did this ever pass?
 2013-08-02 16:13:03 -04:00
Rasmus Lerdorf
d60e168a7a pcre_quote? No such thing. How did this ever pass? 2013-08-02 16:12:21 -04:00
Rasmus Lerdorf
9ca7910661 Merge commit 'ea75b1b' into PHP-5.5 
* commit 'ea75b1b':
  This test needs local infile enabled
 2013-08-02 15:33:40 -04:00
Rasmus Lerdorf
ea75b1b5db This test needs local infile enabled 2013-08-02 15:33:18 -04:00
Rasmus Lerdorf
3d0aca80f2 Merge commit 'e55f08a' into PHP-5.5 
* commit 'e55f08a':
  This test will only work if gc is enabled
 2013-08-02 12:01:12 -04:00
Rasmus Lerdorf
e55f08a5ae This test will only work if gc is enabled 2013-08-02 12:00:48 -04:00
Xinchen Hui
47ac4f8670 Fixed tests (inet_pton behaves differently on Darwin) 2013-08-02 18:43:08 +08:00
Yasuo Ohgaki
1c32b97bc3 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add user contributed test. Bug #61748
 2013-08-02 09:52:50 +09:00
Yasuo Ohgaki
cb13f8318b Add user contributed test. Bug #61748 2013-08-02 09:52:08 +09:00
Christopher Jones
146b933ab4 Revert "Allow 'make distclean' to clean up the 'generated' phar.inc" 
This reverts commit 017145bc57.
 2013-08-01 08:47:13 -07:00
Christopher Jones
017145bc57 Allow 'make distclean' to clean up the 'generated' phar.inc 2013-07-31 12:31:50 -07:00
Dmitry Stogov
5129892788 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
 2013-07-31 17:37:08 +04:00
Dmitry Stogov
4395f70207 Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL) 2013-07-31 17:36:06 +04:00
Dmitry Stogov
35872e101b Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #65018 (SoapHeader problems with SoapServer)
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
  Fixed bug #65336

Conflicts:
	NEWS
 2013-07-31 16:34:26 +04:00
Dmitry Stogov
fd8f454520 Fixed bug #65018 (SoapHeader problems with SoapServer) 2013-07-31 16:32:26 +04:00
Dmitry Stogov
d69b3d8f59 Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s) 2013-07-31 14:20:56 +04:00
Rui Hirokawa
0a974f14d1 MFH: fixed #65045: mb_convert_encoding breaks well-formed character. 2013-07-31 08:46:54 +09:00
Dmitry Stogov
d9e2dc8084 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
  added test script for bug65045.
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
 2013-07-31 03:24:04 +04:00
Dmitry Stogov
f3aca8bc4d Fixed php-5.2 support 2013-07-31 03:22:34 +04:00
Rui Hirokawa
f14ed5bce0 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-07-31 08:18:51 +09:00
Rui Hirokawa
7da3315015 added test script for bug65045. 2013-07-31 08:18:39 +09:00
Rui Hirokawa
c10d7e1afc MFH: fixed #65045: mb_convert_encoding breaks well-formed character. 2013-07-31 08:17:15 +09:00
Dmitry Stogov
02409669e4 Added support for glob symbols in blacklist entries (?, *, **) 2013-07-31 03:01:19 +04:00
Dmitry Stogov
cb17c99511 Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw) 2013-07-30 22:31:37 +04:00
Dmitry Stogov
e2aba1cf9e A minor fix for configure outpu (Tony) 2013-07-30 22:03:21 +04:00
Dmitry Stogov
3550f3d0aa Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown). 2013-07-30 17:35:19 +04:00
Dmitry Stogov
ae5e70afac Merge from GitHub 2013-07-28 13:47:13 +04:00
Yasuo Ohgaki
ef3d813d2c Fixed bug #65336 2013-07-27 05:54:33 +09:00
Yasuo Ohgaki
1d7b6970f2 Fixed bug #65336 2013-07-27 05:54:09 +09:00
Xinchen Hui
9126909c08 Merge branch 'PHP-5.4' into PHP-5.5 2013-07-25 22:44:19 +08:00
Xinchen Hui
9909c4d4c4 Fixed bug #65328 (Segfault when getting SplStack object Value) 2013-07-25 22:43:41 +08:00
Stanislav Malyshev
b8c8a04a85 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix bug #65028 	Phar::buildFromDirectory creates corrupt archives for some specific contents
 2013-07-23 21:45:35 -07:00
Stanislav Malyshev
96a53f6715 Merge branch 'bug65028' into PHP-5.4 
* bug65028:
  fix bug #65028 	Phar::buildFromDirectory creates corrupt archives for some specific contents
 2013-07-23 21:44:06 -07:00
Adam Harvey
f9000fde98 Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro. 
On most platforms, this works fine, but on Linux armhf, strncmp() is a macro
rather than a real function, ergo the macro expansion of ZEND_STRL doesn't
occur until after the compiler knows it needs three parameters for strncmp()
and we get a compile error.

Fixes the fix for bug #61697.
 2013-07-23 11:15:43 -07:00
Anatol Belski
f00d796b7e fix missing include 2013-07-23 18:06:51 +02:00
Johannes Schlüter
7b92a22772 Fix bug 65299 2013-07-23 14:13:22 +02:00
Johannes Schlüter
5a8b0ca8fa Merge branch 'PHP-5.4' into PHP-5.5 2013-07-23 12:57:08 +02:00
Johannes Schlüter
c28ab73d73 Fix compiler warning on redefined constant 2013-07-23 12:50:37 +02:00
Anatol Belski
8aebe0f1e7 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
 2013-07-23 10:00:07 +02:00
Anatol Belski
9b6aa268a3 fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt 2013-07-23 09:59:08 +02:00
Stanislav Malyshev
f8efdc2b4b fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents 2013-07-22 00:57:33 -07:00
Stanislav Malyshev
b8d4a6939e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - addressed bug #65159, Misleading configure help text for --with-mysql-sock
 2013-07-21 23:14:42 -07:00
Yoshinari Takaoka
1b4103c09d - addressed bug #65159, Misleading configure help text for --with-mysql-sock 2013-07-21 23:12:54 -07:00
Stanislav Malyshev
83ced9124e Fix bug #61697 - spl_autoload_functions returns lambda functions incorrectly 2013-07-21 22:47:10 -07:00
Stanislav Malyshev
476924ec3d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
  Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
 2013-07-21 22:31:19 -07:00
Andrey
da3886de6d Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT 2013-07-21 22:25:21 -07:00
Joshua Thijssen
5027fa79d7 Added recursivetreeiterator::setPostfix() method 2013-07-21 22:20:58 -07:00
Veres Lajos
e7a00a2566 add a few comment 2013-07-21 21:14:38 -07:00
Lajos Veres
f51b8d8820 allow both the old and new cfg argument to work. (the old of course should contain the typo) 2013-07-21 21:12:19 -07:00
Veres Lajos
b8941a73cc mssql.compatability_mode fix 2013-07-21 21:12:16 -07:00
Veres Lajos
4749457a49 HASH_KEY_NON_EXISTANT fix 2013-07-21 20:09:53 -07:00
Xinchen Hui
c7b58e4967 Merge branch 'PHP-5.4' into PHP-5.5 2013-07-21 21:07:27 +08:00
Xinchen Hui
3380de9774 Fixed bug #65304 (Use of max int in array_sum) 2013-07-21 21:07:19 +08:00
Gustavo André dos Santos Lopes
3363e04fb4 intl: remove extra quotes from arginfo params 2013-07-21 03:30:28 +02:00
Anatol Belski
d8dd4d9b02 fix header include 
stddef.h is needed to have offsetof macros on windows (at least)
 2013-07-18 15:28:20 +02:00
Arpad Ray
31edf4df56 regenerate url scanner 2013-07-17 16:28:01 +01:00
Arpad Ray
94ab37f06a Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #50308 - session id not appended properly for empty anchor tags
 2013-07-17 16:19:53 +01:00
Arpad Ray
e6ae977082 Fixed bug #50308 - session id not appended properly for empty anchor tags 
The issue was actually because a lack of space before a "/" marking the tag
as empty. This was being swallowed in the rule for unquoted values. Fixed
by making that rule exclude quotes (as per spec anyway).
 2013-07-17 16:07:26 +01:00
Arpad Ray
0d3d739bf7 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #62129 - rfc1867 crashes php even though turned off
 2013-07-17 11:05:23 +01:00
Arpad Ray
ba3234888d Fix bug #62129 - rfc1867 crashes php even though turned off 
Patch by gxd305 at gmail dot com
 2013-07-17 11:02:48 +01:00
Anatol Belski
fd5cdf89a8 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix TS build
 2013-07-16 18:05:45 +02:00
Anatol Belski
bb6d74918e fix TS build 2013-07-16 18:05:14 +02:00
Anatol Belski
f37ac6f591 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  added sapi check for dl() test
 2013-07-16 15:43:37 +02:00
Anatol Belski
135f81c5ae added sapi check for dl() test 2013-07-16 15:42:38 +02:00
Johannes Schlüter
e1a0c90b8b Merge branch 'PHP-5.4' into PHP-5.5 2013-07-16 13:55:32 +02:00
Johannes Schlüter
d3a4af4db8 Make zval2myslqnd implementations aware of inheritance 2013-07-16 13:52:57 +02:00
Anatol Belski
54b740a7e1 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed typo ensuring header str is \0 terminated
 2013-07-16 00:15:29 +02:00
Anatol Belski
bcb39d9c6a Fixed typo ensuring header str is \0 terminated 
This was obviously intended to send an empty header if
php_gmtime_r() fails. Currently it could send garbage.
 2013-07-16 00:14:05 +02:00
Gustavo Lopes
710150ccb7 socket: support unix paths in the abstract namespace 
Those starting with '\0'.
 2013-07-15 23:57:51 +02:00
Gustavo Lopes
e2744f1aa3 socket: fix bug #65260 (SCM_RIGHTS) 
The data for messages of type SOL_SOCKET/SCM_RIGHTS was not being
passed correctly. There were actually two bugs: (1) the number of file
descriptors being passed was being read incorrectly (the length of the
cmsg array was being read instead of that of its 'data' element), as a
result it was generally being reported as always three elements
('level', 'type' and 'data') and (2) the allocated block for writing
the file descriptors was being acessed incorrectly because a 1-based
counter was being used as if it was 0-based.

Any of these two bugs would probably be enough to cause heap
corruption.
 2013-07-15 23:57:49 +02:00
Anatol Belski
904c5d7ba8 kick unused var 2013-07-15 17:23:16 +02:00
Stanislav Malyshev
68e630b72f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too)
  fix invalid variable name at ext/spl/internal/multipleiterator.inc
 2013-07-15 00:36:35 -07:00
sasezaki
e617679c0b fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too) 2013-07-15 00:36:29 -07:00
kazusuke sasezaki
76775a3aa7 fix invalid variable name at ext/spl/internal/multipleiterator.inc 2013-07-15 00:36:19 -07:00
Veres Lajos
2c73ce4363 revert false fix 2013-07-15 00:23:17 -07:00
Veres Lajos
e9a95d78ef typo fixes 2013-07-15 00:23:03 -07:00
Veres Lajos
b79b13b4ef less serious compatAbility fixes 2013-07-15 00:21:39 -07:00
Veres Lajos
bb64106f64 typos (orig) 2013-07-15 00:20:49 -07:00
Veres Lajos
f23a5fbc8e revert false fix 2013-07-15 00:19:07 -07:00
Veres Lajos
72085b0e5f typo fixes 2013-07-15 00:18:57 -07:00
Veres Lajos
b8a2b254a1 typos (orig) 2013-07-15 00:18:32 -07:00
Veres Lajos
227556c6a2 less serious compatAbility fixes 2013-07-15 00:17:35 -07:00
Stanislav Malyshev
9cc9d32e6a Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add built-in web server to invocation list
  Terminology: change embedded web server to built-in web server to align with cli usage
  Align -B and -E parameter names with cli usage (begin_code and end_code)
  Fix Bug #65219 DBSETLDBNAME should be called before login to set DBNAME in login record
 2013-07-14 17:01:43 -07:00
Anatol Belski
6e3134610c Merge branch 'PHP-5.4' of https://github.com/php/php-src into PHP-5.4 2013-07-14 20:48:26 +02:00
Anatol Belski
168a5bb6df Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix uninitialized memory usage
 2013-07-14 20:46:19 +02:00
Anatol Belski
add0833681 fix uninitialized memory usage 2013-07-14 20:44:29 +02:00
Stanley Sufficool
d012bdca03 Fix Bug #65219 
DBSETLDBNAME should be called before login to set DBNAME in login record
 2013-07-14 11:16:42 -07:00
Felipe Pena
efc89368dd Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Bug #65228 (FTPs memory leak) patch by: marco dot beierer at mbsecurity dot ch
 2013-07-13 17:54:41 -03:00
Felipe Pena
0863a0d6a0 - Bug #65228 (FTPs memory leak) patch by: marco dot beierer at mbsecurity dot ch 2013-07-13 17:54:31 -03:00
Felipe Pena
4bd2f755ba Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #65227 (Memory leak in gmp_cmp second parameter)
  Fixed meta data retrieve when OID is larger than 2^31
 2013-07-12 20:23:31 -03:00
Felipe Pena
281936b295 - Fixed bug #65227 (Memory leak in gmp_cmp second parameter) 2013-07-12 20:23:00 -03:00
Yasuo Ohgaki
0ddb3d97de Fixed meta data retrieve when OID is larger than 2^31 2013-07-13 06:06:23 +09:00
Yasuo Ohgaki
bccc3e2ec0 Fixed meta data retrieve when OID is larger than 2^31 2013-07-13 06:05:18 +09:00
Yasuo Ohgaki
002f3ff4dc Inprove pg_unescape_bytea() error message 2013-07-13 06:05:17 +09:00
Anatol Belski
ecf057d197 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #65226 chroot() does not get enabled
 2013-07-11 00:49:41 +02:00
Anatol Belski
2acc386270 Fixed bug #65226 chroot() does not get enabled 2013-07-11 00:48:12 +02:00
Christopher Jones
3478ddc1f0 Cleanup temp test file 2013-07-10 11:17:52 -07:00
Johannes Schlüter
26019d2022 Merge branch 'PHP-5.4' into PHP-5.5 2013-07-10 19:38:00 +02:00
Johannes Schlüter
4204e2cb5b Merge branch 'PHP-5.3' into PHP-5.4 2013-07-10 19:36:12 +02:00
Johannes Schlüter
710eee5555 add test for bug #65236 2013-07-10 19:35:18 +02:00
Christopher Jones
cd7e56e536 Cleanup temp file 2013-07-09 14:51:47 -07:00
Derick Rethans
06cef326fd Merge branch 'PHP-5.4' into PHP-5.5 2013-07-09 09:07:17 +01:00
Derick Rethans
c7ee677f2f - Updated to version 2013.4 (2013d) 2013-07-09 09:07:16 +01:00
Christopher Jones
6ac7c9d0a7 Bump PECL package info version check to allow PECL installs with PHP 5.5+ 2013-07-08 13:32:04 -07:00
Andrey Hristov
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
Andrey Hristov
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
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
bde0f1318a Added warning for hex2bin() when input is invalid string 2013-07-08 19:14:45 +09:00
Yasuo Ohgaki
2bc8271b29 Add warning to pg_unescape_bytea() when invalid parameter is passed 2013-07-08 18:51:37 +09:00
Ben Ramsey
d1c261d7f8 array_column: Changing integer in test output to use %d 2013-07-06 20:50:34 +00: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
332e46b3aa Extended the test for bug #65184 2013-07-03 22:52:51 +02: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
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
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
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
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
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
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
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
27b01cfcd7 Fixed bug #49175: mod_files.sh does not support hash bits 2013-06-29 09:09:23 +09: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
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
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
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
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
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
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
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
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
623386d799 - Fixed typo on condition 2013-06-25 21:53:20 -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
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
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
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
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
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
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
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
9da4985bf2 fix imagecreatefromwebp and imagewebp protos 2013-06-24 11:15:50 +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
b4632d0c12 Upstream fix from https://bitbucket.org/libgd/gd-libgd/issue/75 2013-06-24 11:03:12 +02: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
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
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
Jakub Vrana
e1acaea4f1 Require second parameter of imagecrop() 2013-06-23 20:29:54 -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
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
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
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
2873b5b6eb added some tests based on bug #64395 2013-06-19 16:24:30 +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
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
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
Stanislav Malyshev
af5e2eaf8d Merge branch 'pull-request/320' 
* pull-request/320:
  this is test 5 not 6
  fix race condition
  more shared names that create race conditions
  change to a unique filename
  more shared filenames
  yet another shared filename
  don't share a filename to stop race conditions
  fix race condition for 2-4 and normalize names for others
  fix race condition when running tests in parallel
  clean up after test
  Fix #64572: Clean up after the test
  Fix #64572: Clean up after the test
 2013-06-17 01:06:20 -07:00
Stanislav Malyshev
6b896fa57f Merge branch 'pull-request/320' 
* pull-request/320:
  this is test 5 not 6
  fix race condition
  more shared names that create race conditions
  change to a unique filename
  more shared filenames
  yet another shared filename
  don't share a filename to stop race conditions
  fix race condition for 2-4 and normalize names for others
  fix race condition when running tests in parallel
  clean up after test
  Fix #64572: Clean up after the test
  Fix #64572: Clean up after the test
 2013-06-17 01:06:01 -07:00
Stanislav Malyshev
a080611e48 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Tests: PDO Mysql - update for fixed getColumnMeta()
  fix bug #48724
 2013-06-17 00:42:21 -07:00
Daniel Beardsley
5ac0ee30ce Tests: PDO Mysql - update for fixed getColumnMeta() 
The test has always been disabled... so it's never run anyway. Oh well.
 2013-06-17 00:41:21 -07:00
Antony Dovgal
95cc763a14 fix bug #48724 
PDO's getColumnMeta() doesn't return native_type for BIT, TINYINT and YEAR
 2013-06-17 00:27:21 -07:00
Stanislav Malyshev
69d187de02 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  readline can output control codes
  Bug #55694: Update readline test to support attempted_completion_over variable
  Bug #55694: Expose attempted_completion_over variable from readline library
 2013-06-17 00:17:06 -07:00
Stanislav Malyshev
248414f132 readline can output control codes 2013-06-17 00:15:31 -07:00
Hartmel
272c5edea4 Bug #55694: Update readline test to support attempted_completion_over variable 2013-06-16 23:44:44 -07:00
Hartmel
ca3e0862db Bug #55694: Expose attempted_completion_over variable from readline library 2013-06-16 23:42:43 -07:00
Xinchen Hui
aa2369f85a Merge branch 'PHP-5.4' into PHP-5.5 2013-06-17 13:23:24 +08:00
Xinchen Hui
cfb1ffb4fa Fix typo in test 2013-06-17 13:22:20 +08:00
Stanislav Malyshev
7d1fef15cf Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  add more tests for bug #64166
  Move unsigned char declaration to top of block
  trailing ws
  Fix #64166: quoted-printable-encode stream filter incorrectly discarding whitespace
  Fix #64166: quoted-printable-encode stream filter incorrectly discarding whitespace
 2013-06-16 16:38:49 -07:00
Stanislav Malyshev
7bb052ee3e add more tests for bug #64166 2013-06-16 16:34:34 -07:00
Michael M Slusarz
0dc98208ee Move unsigned char declaration to top of block 2013-06-16 16:04:29 -07:00
Michael M Slusarz
d9c034ee5e trailing ws 2013-06-16 16:04:24 -07:00
Michael M Slusarz
b5b0a53b09 Fix #64166: quoted-printable-encode stream filter incorrectly discarding whitespace 
Second attempt: need to use lookaheadto determine whether to encode ws
 2013-06-16 16:04:19 -07:00
Michael M Slusarz
600d6deef9 Fix #64166: quoted-printable-encode stream filter incorrectly discarding whitespace 
If trailing whitespace on a line is detected, mark the linebreak as a
soft linebreak.
 2013-06-16 16:04:14 -07:00
Stanislav Malyshev
ac343d5c1f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #64936 - clean doc comment state at the beginning and end of the scan
  ws fix

Conflicts:
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner.l
	Zend/zend_language_scanner_defs.h
 2013-06-16 15:29:25 -07:00
Stanislav Malyshev
2208447d42 Fix bug #64936 - clean doc comment state at the beginning and end of the scan 2013-06-16 15:22:23 -07:00
Anatol Belski
3625b83aaa Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix test
 2013-06-17 00:10:32 +02:00
Anatol Belski
b6dd1ec60d fix test 
breach introduced in ac40c0b562
 2013-06-17 00:09:05 +02:00
Xinchen Hui
6cd6349ff8 Merge branch 'PHP-5.4' into PHP-5.5 2013-06-16 22:56:22 +08:00
Xinchen Hui
49e57a3165 Fixed bug #63176 (Segmentation fault when instantiate 2 persistent PDO to the same db server) 2013-06-16 22:55:59 +08:00
Boris Lytochkin
3dd2de3f45 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix typo in test
 2013-06-16 00:09:55 +04:00
Boris Lytochkin
7457867ba8 fix typo in test 2013-06-16 00:09:18 +04:00
Anatol Belski
a0cb61b292 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  ensure the error_reporting level to get expected notice
 2013-06-12 13:15:18 +02:00
Anatol Belski
ed2690477c Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  ensure the error_reporting level to get expected notice
 2013-06-12 13:14:53 +02:00
Anatol Belski
cd1b44c4b6 ensure the error_reporting level to get expected notice 2013-06-12 13:13:48 +02:00
Anatol Belski
cb542d3c83 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed tests
 2013-06-11 12:39:50 +02:00
Anatol Belski
1cc750493f Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fixed tests
 2013-06-11 12:39:28 +02:00
Anatol Belski
eccc05fc44 fixed tests 2013-06-11 12:38:49 +02:00
Anatol Belski
251ec84a97 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  missing tests for bug #53437
 2013-06-11 11:22:55 +02:00
Anatol Belski
f16143f5ac missing tests for bug #53437 2013-06-11 11:19:57 +02:00
Anatol Belski
bd4f6ad8a0 fixed EOL 2013-06-11 08:32:54 +02:00
Anatol Belski
28e264db2a added closing ?> 2013-06-11 08:25:38 +02:00
Stanislav Malyshev
4427d1dcfd Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:30:59 -07:00
Stanislav Malyshev
02e4d7a290 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:20:18 -07:00
Anatol Belski
ec79075394 split the test for 32 and 64 bit 2013-06-10 22:49:30 +02:00
Stanislav Malyshev
84e35fb2e0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  typo fixes (argument)
  typo fixes (accommodate, parameter)
 2013-06-10 13:36:41 -07:00
Veres Lajos
04145dc2aa typo fixes (argument) 2013-06-10 13:36:17 -07:00
Veres Lajos
ed2e84e239 typo fixes (accommodate, parameter) 2013-06-10 13:36:03 -07:00
Anatol Belski
0f9cf35315 Backported the fix for bug #53437 2013-06-10 19:52:29 +02:00
Anatol Belski
88c2dbe5fc Backported the fix for bug #53437 2013-06-10 19:48:18 +02:00
Anatol Belski
760c85a70a fixed the test 2013-06-10 18:31:18 +02:00
Anatol Belski
02f3922047 Fix a BC breach related to bug #53437 
days and special_amount properties are exported as int again
 2013-06-10 17:48:13 +02:00
Jakub Vrana
46d3738d0a Fix image method signatures 2013-06-10 02:24:03 -07:00
Stanislav Malyshev
7a2d9690fe Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded
 2013-06-10 01:53:29 -07:00
Antonio Diaz Ruiz
8a8bef1b73 PHPTests for the DOMDocument::loadHTMLfile method. 
They cover
- The basic behaviour
- When the method receives as argument a file which doesn't exist
- When the argument is an empty string
- When an empty file is loaded
- When a not-well formed html file is loaded

It also includes 2 auxilary files
- An empty html file
- A not well formed html file
 2013-06-10 01:50:00 -07:00
Dmitry Stogov
731b4a3fa4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Callback has to be restored in MSHUTDOWN
 2013-06-10 12:34:08 +04:00
Dmitry Stogov
336a8e1943 Callback has to be restored in MSHUTDOWN 2013-06-10 12:32:53 +04:00
Dmitry Stogov
53e6529203 Fixed comments 2013-06-10 12:05:20 +04:00
Dmitry Stogov
23a9bb09ba Avoid multiple allocations of the same key in different processes 2013-06-10 11:43:03 +04:00
Dmitry Stogov
540488bf55 Compact HashTables before storing them in shared memory 2013-06-10 11:22:19 +04:00
Dmitry Stogov
2e9d3e8b39 Use size_t instead of int 2013-06-10 10:36:35 +04:00
Xinchen Hui
3f229f4364 Merge branch 'PHP-5.4' into PHP-5.5 2013-06-09 22:25:49 +08:00
Xinchen Hui
f338510c94 Merge branch 'PHP-5.3' into PHP-5.4 2013-06-09 22:25:07 +08:00
Xinchen Hui
75c57122e3 Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on 64-bits systems) 2013-06-09 22:24:48 +08:00
Anatol Belski
bbdbef40db Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated NEWS
  Fixed bug #64934 Apache2 TS crash with get_browser()
 2013-06-06 18:52:39 +02:00
Anatol Belski
25cae37b13 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #64934 Apache2 TS crash with get_browser()
 2013-06-06 18:51:32 +02:00
Anatol Belski
1aee7ad636 Fixed bug #64934 Apache2 TS crash with get_browser() 
In favour of reading the browscap.ini into a true global var
only once in MINIT, the price for that is to deep copy the
any data from it.
 2013-06-06 18:49:04 +02:00
Stanislav Malyshev
785f4c5fc6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix CVE-2013-2110 - use correct formula to calculate string size
 2013-06-04 22:00:45 -07:00
Stanislav Malyshev
efdeec3c0e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fix CVE-2013-2110 - use correct formula to calculate string size
 2013-06-04 21:58:44 -07:00
Stanislav Malyshev
93e0d78ec6 fix CVE-2013-2110 - use correct formula to calculate string size 2013-06-04 21:56:33 -07:00
Stanislav Malyshev
74e52eaea9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  news for dblib fixes
  Fix PDO_DBLIB bugs: #64338, #64808, #63638

Conflicts:
	ext/pdo_dblib/dblib_driver.c
	ext/pdo_dblib/dblib_stmt.c
 2013-06-03 22:00:51 -07:00
Stanley Sufficool
d8f938c784 FIX BUG #55647, #60512, #60512, #61900, #64338, #64808, #63638 
Return an error on passwords longer than 30 chars instead of segfault.
Set error and message handlers properly.
Do not segfault in out of bound colnums in getColumnMeta()
Fix DBSETOPT to use a blank string instead of NULL to stop FreeTDS complaints.
Use DBSETLDBNAME for compatibillity with SQL Azure.
 2013-06-03 20:34:47 -07:00
Stanley Sufficool
5a04ab9a54 Fix PDO_DBLIB bugs: #64338, #64808, #63638 
Synchronize with master
 2013-06-03 20:02:08 -07:00
Remi Collet
3579e81200 Fixed Bug #64962 imagerotate produce corrupted image 
See https://bitbucket.org/libgd/gd-libgd/issue/67/problem-with-gdrotate

This computation need to be done in signed range.
 2013-06-03 15:01:48 +02:00
Remi Collet
99ea60c2dd Fixed Bug #64961 segfault in imagesetinterpolation 
enum type are not long ;) so cannot be used as zend_parse_parameters arg.
 2013-06-03 14:15:18 +02:00
Matteo Beccati
ad135fc69f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Clean up leftover test files
  Improved test portability so that it doesn't fail with pdo_pgsql
  Fix PDO::inTransaction() test for pgsql
 2013-06-02 13:39:38 +02:00
Matteo Beccati
7360f0f1e6 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Clean up leftover test files
 2013-06-02 13:39:19 +02:00
Matteo Beccati
2463e89794 Clean up leftover test files 2013-06-02 13:38:43 +02:00
Matteo Beccati
a98359b7b9 Improved test portability so that it doesn't fail with pdo_pgsql 2013-06-02 13:32:48 +02:00
Nikita Popov
cbf90b1a90 Fix PDO::inTransaction() test for pgsql 
inTransaction() nowadays casts the in_transaction result to boolean.
I'm not sure whether the INERROR state should result in true or false.
For now I went with the result that we actually get.
 2013-06-02 13:28:30 +02:00
Matteo Beccati
d5a1c0cae2 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #64609 (pg_convert enum type support)
 2013-06-02 06:34:05 +02:00
Matteo Beccati
51c065f611 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #64609 (pg_convert enum type support)
 2013-06-02 06:33:54 +02:00
Matteo Beccati
25aae37229 Fixed bug #64609 (pg_convert enum type support) 2013-06-02 06:29:35 +02:00
Matteo Beccati
d9c2eecec0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #62857 (bytea test failures)
 2013-06-01 23:23:14 +02:00
Matteo Beccati
de42833115 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #62857 (bytea test failures)
 2013-06-01 23:22:50 +02:00
Matteo Beccati
79803bebde Fixed bug #62857 (bytea test failures) 
Postgres 9.1+ test fixes. Tests were failing due to the default
standard_conforming_strings GUC being changed to on. Also the
pg_escape_bytea test was encoding the data before estabilishing
a connection, thus falling back to the old escaping type which
isn't properly handled by the backend when using a default
configuration.

I haven't updated the NEWS file as it's just test fixes.
 2013-06-01 23:15:48 +02:00
Matteo Beccati
d19e46d9d4 Merge branch 'PHP-5.4' into PHP-5.5 2013-05-31 16:27:01 +02:00
Matteo Beccati
a3b5b42e77 Merge branch 'PHP-5.3' into PHP-5.4 2013-05-31 16:26:54 +02:00
Matteo Beccati
510498947e Slightly edited tests and fix for bug #62024 2013-05-31 16:19:58 +02:00
Matheus Degiovani
df6ca450ce Fixed bug #62024 (unable to run consecutive prepared querys with null values) 
Credits to james@kenjim.com for the patch.
 2013-05-31 14:30:57 +02:00
Matheus Degiovani
65d233f06c Fixed bug #64037 (wrong value returned when using a negative numeric field equal to the scale) 2013-05-31 14:30:51 +02:00
Remi Collet
f3ca1d3125 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fixed Bug #64949 (Buffer overflow in _pdo_pgsql_error)
 2013-05-31 08:45:32 +02:00
Remi Collet
2dd67abb7d Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed Bug #64949 (Buffer overflow in _pdo_pgsql_error)
 2013-05-31 08:44:33 +02:00
Remi Collet
1c623e3b07 Fixed Bug #64949 (Buffer overflow in _pdo_pgsql_error) 
There is a lot of call such as:
	pdo_pgsql_error(dbh, PGRES_FATAL_ERROR, "Copy command failed");
Where the 3rd paramater is a error message string where a sqlstate (5 chars)
is expected. This cause a segfault in copy_from.phpt and copy_to.phpt.

This is only a sanity check to avoid buffer overflow, but obviously this
calls need to be fixed (using NULL or a correct sqlstate).
 2013-05-31 08:39:32 +02:00
Rasmus Lerdorf
4c762152bf Use size_t everywhere instead 2013-05-29 14:34:53 -07:00
Rasmus Lerdorf
29ee4b81f2 This needs to be a long 
Otherwise we are limited to a 32G opcache segment
 2013-05-29 14:22:43 -07:00
Dmitry Stogov
ad90e90d90 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
  Fix #64745 hash_pbkdf2 truncation issue
 2013-05-29 00:02:37 +04:00
Dmitry Stogov
6008ac8e32 Fixed crash during search in empty persistent HashTable 2013-05-28 23:45:36 +04:00