Yasuo Ohgaki
cb13f8318b
Add user contributed test. Bug #61748
2013-08-02 09:52:08 +09:00
Christopher Jones
1c91ca990f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Revert "Allow 'make distclean' to clean up the 'generated' phar.inc"
2013-08-01 08:49:19 -07: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
1f6b940dd1
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Use PHP's major version when cleaning up Apache .module files
Allow 'make distclean' to clean up the 'generated' phar.inc
2013-07-31 12:36:20 -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
Sara Golemon
2141f394d8
Merge branch 'pull-request/399'
2013-07-31 00:49:30 -07:00
Dmitry Stogov
e8b1739949
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
2013-07-31 17:37:27 +04:00
Dmitry Stogov
380e5d5d03
Merge branch 'PHP-5.5'
...
* PHP-5.5:
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:35:09 +04:00
Dmitry Stogov
e2a433fc5d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s)
added test script for bug65045.
MFH: fixed #65045 : mb_convert_encoding breaks well-formed character.
Conflicts:
NEWS
2013-07-31 14:24:30 +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
a0fece5201
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed php-5.2 support
2013-07-31 03:23:10 +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
5338bbbf38
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added support for glob symbols in blacklist entries (?, *, **)
Conflicts:
NEWS
2013-07-31 03:04:00 +04:00
Dmitry Stogov
02409669e4
Added support for glob symbols in blacklist entries (?, *, **)
2013-07-31 03:01:19 +04:00
Dmitry Stogov
147d5241dc
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)
2013-07-30 22:33:46 +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
e831041c5a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
A minor fix for configure outpu (Tony)
2013-07-30 22:04:55 +04:00
Dmitry Stogov
e2aba1cf9e
A minor fix for configure outpu (Tony)
2013-07-30 22:03:21 +04:00
Dmitry Stogov
0aa342e903
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown).
Conflicts:
NEWS
2013-07-30 17:36:47 +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
Andrey Hristov
92d27ccb05
Constify streams API and a few other calls down the rabbit hole.
...
(`char *` to `const char *` for parameters and few return values)
In a few places int len moved to size_t len.
2013-07-30 12:49:36 +02:00
Anatol Belski
5e1ac558c3
make simplexml headers available to the outta world
2013-07-29 22:18:55 +02:00
Dmitry Stogov
294335761b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Merge from GitHub
Update NEWS
Fixed bug #65336
Conflicts:
NEWS
2013-07-28 13:50:13 +04:00
Dmitry Stogov
ae5e70afac
Merge from GitHub
2013-07-28 13:47:13 +04:00
Yasuo Ohgaki
d4aee1021e
Fixed bug #65336
2013-07-27 05:55:02 +09: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
Christopher Jones
85b66e9e21
OCI8 extension: Allow Implicit Result Set statement resources to inherit the parent's current prefetch count
2013-07-26 13:34:45 -07:00
Christopher Jones
586fc4909e
Fix --enable-maintainer-zts mode in OCI8 2.0
2013-07-25 16:15:32 -07:00
Christopher Jones
fe98ffc227
Update UPGRADING and make typo fixes to OCI8 package.xml
2013-07-25 10:54:03 -07:00
Xinchen Hui
c49de17fe5
Merge branch 'PHP-5.5'
2013-07-25 22:46:21 +08: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
Christopher Jones
bfc3c223da
Initial PHP OCI8 2.0.0-dev commit.
...
Includes Oracle Database 12c Implicit Result Set support, DTrace
support, and various code cleanups.
See package.xml for details.
2013-07-24 15:33:22 -07:00
Stanislav Malyshev
86064e0701
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents
2013-07-23 21:46:23 -07: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
7fa841c888
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro.
2013-07-23 11:19:02 -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
678ef6a133
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix missing include
2013-07-23 18:07:16 +02:00
Anatol Belski
f00d796b7e
fix missing include
2013-07-23 18:06:51 +02:00
Johannes Schlüter
416e270835
Merge branch 'PHP-5.5'
2013-07-23 14:14:18 +02:00
Johannes Schlüter
7b92a22772
Fix bug 65299
2013-07-23 14:13:22 +02:00
Johannes Schlüter
6b4742582f
Merge branch 'PHP-5.5'
2013-07-23 13:15:15 +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
94e15ff387
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
2013-07-23 10:00:24 +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
Andrey Hristov
a48e2bad62
Merge branch 'master' of ssh://git.php.net/php-src
2013-07-22 11:03:10 +02:00
Andrey Hristov
a047ece2e0
Disable a flag
2013-07-22 11:02:48 +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
8d2651d8fc
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- addressed bug #65159 , Misleading configure help text for --with-mysql-sock
2013-07-21 23:15:03 -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
46cc826770
Merge branch 'pull-request/231'
...
* pull-request/231:
update Zend Engine logo as per Zeev, and tweak PHP logos ... :)
fix for scrolling, other minor tweaks
Bump up table width a bit more and make columns consistent
Bringing CSS up to this decade's standards.
2013-07-21 22:49:26 -07:00
Stanislav Malyshev
e68cd521dc
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug #61697 - spl_autoload_functions returns lambda functions incorrectly
2013-07-21 22:48:03 -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
3cbb48f055
Merge branch 'PHP-5.5'
...
* PHP-5.5:
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:37 -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
Stanislav Malyshev
10c547018f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added recursivetreeiterator::setPostfix() method
2013-07-21 22:22:02 -07:00
Joshua Thijssen
5027fa79d7
Added recursivetreeiterator::setPostfix() method
2013-07-21 22:20:58 -07:00
Stanislav Malyshev
1a05648e6d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
next is 5.5.2
add a few comment
allow both the old and new cfg argument to work. (the old of course should contain the typo)
mssql.compatability_mode fix
Conflicts:
configure.in
main/php_version.h
2013-07-21 21:17:59 -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
Stanislav Malyshev
02457554a3
Merge branch 'PHP-5.5'
...
* PHP-5.5:
backward compatibility
HASH_KEY_NON_EXISTANT fix
2013-07-21 20:10:31 -07:00
Veres Lajos
4749457a49
HASH_KEY_NON_EXISTANT fix
2013-07-21 20:09:53 -07:00
Xinchen Hui
a522f2d1c9
Merge branch 'PHP-5.5'
2013-07-21 21:07:50 +08: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
cbd1faf077
Merge branch 'PHP-5.5'
...
* PHP-5.5:
intl: remove extra quotes from arginfo params
2013-07-21 03:30:42 +02:00
Gustavo André dos Santos Lopes
3363e04fb4
intl: remove extra quotes from arginfo params
2013-07-21 03:30:28 +02:00
Rui Hirokawa
cb607d4f78
updated test script for bug #65045 .
2013-07-21 10:18:33 +09:00
Anatol Belski
c6651942ce
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix header include
new NEWS for next release
2013-07-18 15:29:17 +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
Johannes Schlüter
f7e204d7ed
Slightly modernize ext_skel and sekelton/
...
- .svnignore ->.gitignore
- Add .gitignore entries for DSO stand-alone builds stuff
- Docs don't use CVS but SVN
- reorder extname.c file so it needs less forward declarations
- take forward declarations out of php_extname.h
- Drop #if for 12 years old PHP version compatibility
2013-07-17 23:18:13 +02:00
Arpad Ray
b594949144
Merge branch 'PHP-5.5'
...
* PHP-5.5:
regenerate url scanner
Fixed bug #50308 - session id not appended properly for empty anchor tags
2013-07-17 16:28:12 +01: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
fb53871d94
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug #62129 - rfc1867 crashes php even though turned off
2013-07-17 11:09:37 +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
be721d5d8b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix TS build
2013-07-16 18:06:05 +02: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
12aec9ec8e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
added sapi check for dl() test
2013-07-16 15:43:59 +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
dc489c30f0
Merge branch 'PHP-5.5'
2013-07-16 13:56:06 +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
83a60d45f5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed typo ensuring header str is \0 terminated
2013-07-16 00:15:54 +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
2443df37fd
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS for 710150c
and e2744f1
socket: support unix paths in the abstract namespace
socket: fix bug #65260 (SCM_RIGHTS)
2013-07-16 00:03:00 +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
af377da60a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
kick unused var
2013-07-15 17:23:48 +02:00
Anatol Belski
904c5d7ba8
kick unused var
2013-07-15 17:23:16 +02:00
Stanislav Malyshev
6aa694a8d8
Merge branch 'PHP-5.5'
...
* PHP-5.5:
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:43 -07: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
c2088f8b81
revert false fix
2013-07-15 00:19:56 -07:00
Veres Lajos
1b06e0be96
typo fixes
2013-07-15 00:19:49 -07:00
Veres Lajos
d17e8ac32f
less serious compatAbility fixes
2013-07-15 00:19:39 -07:00
Veres Lajos
6c4af15d6c
typos (orig)
2013-07-15 00:19:32 -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
50f15bb921
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add news for bug #65219
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:07:33 -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
14b67ed6da
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix uninitialized memory usage
2013-07-14 20:46:48 +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
b64e2218f2
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Bug #65228 (FTPs memory leak) patch by: marco dot beierer at mbsecurity dot ch
2013-07-13 17:54:52 -03: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
Sara Golemon
95017c0522
Add a couple more test cases to parse_url() tests
...
http://::# (valid but silly)
http://# (invalid)
2013-07-10 08:26:47 -07:00
Yasuo Ohgaki
914f8fd304
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed meta data retrieve when OID is larger than 2^31
Conflicts:
ext/pdo_pgsql/pgsql_statement.c
2013-07-11 12:25:24 +09:00
Yasuo Ohgaki
0ed36d4478
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed meta data retrieve when OID is larger than 2^31
2013-07-11 12:23:23 +09:00
Yasuo Ohgaki
8679bffaca
Fixed meta data retrieve when OID is larger than 2^31
2013-07-11 12:23:11 +09:00
Yasuo Ohgaki
ed00dc8f82
Inprove pg_unescape_bytea() error message
2013-07-11 12:13:09 +09:00
Anatol Belski
ecb55dd9f5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated NEWS
Fixed bug #65226 chroot() does not get enabled
2013-07-11 00:52:08 +02:00
Christopher Jones
56b2b74409
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Cleanup temp test file
2013-07-10 11:22:16 -07:00
Johannes Schlüter
9c0cd00b44
Merge branch 'PHP-5.5'
2013-07-10 19:38:29 +02:00
Christopher Jones
3fd987f493
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Cleanup temp file
2013-07-09 14:53:05 -07:00
Christopher Jones
cd7e56e536
Cleanup temp file
2013-07-09 14:51:47 -07:00
Derick Rethans
3cdd09a76e
Merge branch 'PHP-5.5'
2013-07-09 09:07:21 +01: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
Yasuo Ohgaki
baac810eb8
Improve pg_unescape_bytea() error message
2013-07-09 14:54:03 +09:00
Yasuo Ohgaki
84e6576203
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed pgsql_stmt_get_column_meta() OID signedness
2013-07-09 07:02:09 +09:00
Yasuo Ohgaki
98e6473f98
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed pgsql_stmt_get_column_meta() OID signedness
2013-07-09 07:00:47 +09:00
Yasuo Ohgaki
24037fd3d9
Fixed pgsql_stmt_get_column_meta() OID signedness
2013-07-09 06:59:50 +09:00
Christopher Jones
0cf978c92e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Bump PECL package info version check to allow PECL installs with PHP 5.5+
2013-07-08 13:39:26 -07: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
e78ca0b634
Merge branch 'master' of ssh://git.php.net/php-src
2013-07-08 20:26:38 +02:00
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