Andrey Hristov
ae9ba081c8
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4
2012-12-19 15:08:09 +01:00
Andrey Hristov
0a8777a515
Merge branch 'master' of ssh://git.php.net/php-src
2012-12-19 15:07:03 +01:00
Andrey Hristov
c780ddbb50
Merge branch 'PHP-5.4'
...
Conflicts:
ext/mysqlnd/mysqlnd_alloc.c
2012-12-19 15:05:47 +01:00
Remi Collet
f98a03b144
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix failing test on Linux build
2012-12-19 10:25:16 +01:00
Remi Collet
828bb4d44d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix failing test on Linux build
2012-12-19 10:25:05 +01:00
Remi Collet
3732fa95c5
fix failing test on Linux build
2012-12-19 10:23:57 +01:00
Andrey Hristov
1f7c46b579
be cautious about the result of strrchr
2012-12-18 16:21:05 +01:00
Xinchen Hui
73c9889663
Merge branch 'PHP-5.5'
2012-12-17 14:30:41 +08:00
Xinchen Hui
ea649a5aba
Merge branch 'PHP-5.4' into PHP-5.5
2012-12-17 14:30:20 +08:00
Xinchen Hui
05deaf1706
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-17 14:29:45 +08:00
Xinchen Hui
06739a1b72
dos2unix & skip on connect fail
2012-12-17 14:29:13 +08:00
Xinchen Hui
6f452126ac
Merge branch 'PHP-5.5'
2012-12-17 12:58:38 +08:00
Xinchen Hui
ea5132866f
Merge branch 'PHP-5.4' into PHP-5.5
2012-12-17 12:58:12 +08:00
Xinchen Hui
2f7f57a407
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-17 12:57:37 +08:00
Xinchen Hui
d2cc097049
Fix failed test
2012-12-17 12:56:55 +08:00
Rasmus Lerdorf
42f3344d85
Merge branch 'PHP-5.5'
2012-12-13 16:54:51 -08:00
Rasmus Lerdorf
5aabf243bf
Merge branch 'PHP-5.4' into PHP-5.5
2012-12-13 16:54:44 -08:00
Rasmus Lerdorf
77c4b84ac8
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-13 16:54:31 -08:00
Rasmus Lerdorf
7a49e09fd8
Need connect.inc here
2012-12-13 16:54:16 -08:00
Rasmus Lerdorf
c701aeba0b
Merge branch 'PHP-5.5'
2012-12-13 16:43:04 -08:00
Rasmus Lerdorf
3925683d46
Merge branch 'PHP-5.4' into PHP-5.5
2012-12-13 16:42:50 -08:00
Rasmus Lerdorf
d845549257
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-13 16:42:33 -08:00
Rasmus Lerdorf
9d1bc1b622
Fix broken test
...
Need to use the configured connection parameters here. We can't assume
the test user has access.
2012-12-13 16:41:56 -08:00
Rasmus Lerdorf
17b803d448
Merge branch 'PHP-5.4' into PHP-5.5
2012-12-13 16:17:34 -08:00
Rasmus Lerdorf
8fbeb6e342
Merge branch 'PHP-5.4'
2012-12-13 16:16:45 -08:00
Rasmus Lerdorf
538d8338c0
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-13 16:15:06 -08:00
Rasmus Lerdorf
eecdb4c254
Fix broken test
...
This was missing a %s for the path here
2012-12-13 16:13:37 -08:00
Arpad Ray
c66e54d72e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix #63379 - Don't reset mod_user_is_open in destroy
2012-12-14 00:03:08 +00:00
Arpad Ray
61bf1f4ee6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix #63379 - Don't reset mod_user_is_open in destroy
2012-12-13 23:59:34 +00:00
Arpad Ray
6566ea6173
Fix #63379 - Don't reset mod_user_is_open in destroy
...
The parent handler is still open so the reset here was in error.
2012-12-13 23:51:43 +00:00
Anatoliy Belsky
54a04d2553
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed mysqlnd compilation in debug mode on windows
2012-12-13 15:06:15 +01:00
Anatoliy Belsky
bef54e5365
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed mysqlnd compilation in debug mode on windows
2012-12-13 15:05:35 +01:00
Anatoliy Belsky
0d458ae89f
Fixed mysqlnd compilation in debug mode on windows
2012-12-13 15:01:01 +01:00
Xinchen Hui
4d2593e1be
Merge branch 'PHP-5.4' into PHP-5.5
2012-12-13 10:45:33 +08:00
Xinchen Hui
1f516510b7
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-13 10:44:56 +08:00
Xinchen Hui
39a3007ab2
MFH
2012-12-13 10:44:14 +08:00
Xinchen Hui
3516b9857f
Merge branch 'license_fix' of https://github.com/leight/php-src
2012-12-13 10:38:20 +08:00
Remi Collet
1f73ce3ed6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Really fix test pdo_mysql_class_constants.phpt
2012-12-12 16:58:51 +01:00
Remi Collet
6e4cfa18f7
Really fix test pdo_mysql_class_constants.phpt
...
- with mysqlnd, constant always present
- with mysqli, check client library version
- without mysqlnd and without mysqli
skip the test if no connection
use connection to check client library
Note : MySQLPDOTest::getClientVersion() is broken with mysqlnd
as PDO::ATTR_CLIENT_VERSION return "mysqlnd 5.0.11-dev - 20120503..."
so, getClientVersion() return "11"
2012-12-12 16:53:18 +01:00
Leigh
349baa3da4
Fixed license
...
Looks like a find and replace gone wrong.
2012-12-12 12:14:52 +00:00
Remi Collet
261995e02a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed Bug #63738 unpack: back result with Z format
2012-12-11 16:34:51 +01:00
Remi Collet
4d8d5d83fc
Fixed Bug #63738 unpack: back result with Z format
...
Fix result for empty string.
Same output as perl
perl -e 'print unpack("Z2","\0\0");' => ""
perl -e 'print unpack("Z2","A\0");' => "A"
perl -e 'print unpack("Z2","AB\0");' => "AB"
perl -e 'print unpack("Z2","ABC\0");'=> "AB"
2012-12-11 16:30:08 +01:00
Adam Harvey
b10460dc4b
Merge branch 'PHP-5.5'
2012-12-11 19:58:04 +08:00
Adam Harvey
8bb106d20c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Alter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare numbers.
2012-12-11 19:53:02 +08:00
Adam Harvey
2d1694d4eb
Alter php_json_decode_ex() to respect JSON_BIGINT_AS_STRING for bare numbers.
...
Fixes bug #63737 (json_decode does not properly decode with options parameter).
2012-12-11 19:51:30 +08:00
Adam Harvey
ac0fb01a21
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Deprecate ext/mysql.
2012-12-10 22:26:17 +08:00
Adam Harvey
b7091aaf01
Deprecate ext/mysql.
...
Per https://wiki.php.net/rfc/mysql_deprecation , connecting to a MySQL database
via ext/mysql now generates an E_DEPRECATED error. This commit includes the
minimal EXPECTF updates required for the test suite to pass: it may be
preferable to refactor some of the tests to suppress deprecation errors in
situations where no other error is expected from mysql_[p]connect(), but I'm
not enough of a MySQL expert to want to get my hands that dirty in a long
standing test suite.
2012-12-10 22:12:09 +08:00
Sebastian Bergmann
6fc2ecaaf2
Merge branch 'PHP-5.5'
2012-12-06 09:30:47 +01:00
Sebastian Bergmann
eab14993fe
Invoke re2c with --no-generation-date to prevent unintentional / unnecessary changes in generated files.
2012-12-06 09:28:35 +01:00
Sara Golemon
5ac35770f4
Add UConverter class (ICU's UConverter API)
...
RFC at http://wiki.php.net/rfc/uconverter
2012-12-05 15:07:36 -08:00
Dmitry Stogov
bc7857169a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Use get_gc instead of hacks of get_properties
2012-12-05 17:59:46 +04:00
Dmitry Stogov
df97c3aa0d
Use get_gc instead of hacks of get_properties
2012-12-05 17:58:36 +04:00
Dmitry Stogov
274ceb3d8d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #63680 (Memleak in splfixedarray with cycle reference)
Conflicts:
NEWS
2012-12-05 17:55:21 +04:00
Dmitry Stogov
881416cda6
Fixed bug #63680 (Memleak in splfixedarray with cycle reference)
2012-12-05 17:53:26 +04:00
Stanislav Malyshev
1c8f106d9a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #63666 - Poor date() performance
2012-12-04 21:02:55 -08:00
Stanislav Malyshev
fd650ec93e
fix bug #63666 - Poor date() performance
2012-12-04 21:02:09 -08:00
Remi Collet
784850211e
Reduce case where this test will fails:
...
- no connection AND no mysqli extension
So, will succeed when no configured connection, but mysqli available.
2012-12-03 15:32:52 +01:00
Anatoliy Belsky
17dd769ab0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Revert the previous test fix
2012-12-03 15:16:34 +01:00
Anatoliy Belsky
b8553d8494
Revert the previous test fix
...
The fail seems to be due to network error
2012-12-03 15:14:43 +01:00
Remi Collet
e3aad69ccc
Fix inifile.c:419:6: warning: variable 'ret' set but not used [-Wunused-but-set-variable]
...
Please check this minor change.
Avoid, warning: 'pos_grp_start' may be used uninitialized in this function [-Wmaybe-uninitialized]
2012-12-03 13:38:12 +01:00
Remi Collet
869e6508b3
use php_stream_copy_to_stream_ex instead of deprecated php_stream_copy_to_stream
2012-12-03 13:35:26 +01:00
Anatoliy Belsky
262decd35f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix test with a slightly different warning in TS
2012-12-03 10:44:10 +01:00
Anatoliy Belsky
89e547ce7f
Fix test with a slightly different warning in TS
2012-12-03 10:41:17 +01:00
Lars Strojny
575b983703
Merge branch 'PHP-5.4' into PHP-5.5
2012-12-02 19:42:25 +01:00
Igor Wiedler
ec2a132f9c
Bug #49341 : Add SO_REUSEPORT support for socket_set_option()
...
This is a BSD-only feature, and it will only be available on BSD.
On other platforms the constant will simply not be set.
2012-12-02 18:56:57 +01:00
Remi Collet
50fec2bae2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed Bug #63435 Datetime::format('u') sometimes wrong by 1 microsecond
2012-12-01 10:26:32 +01:00
Remi Collet
92a5e4def0
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed Bug #63435 Datetime::format('u') sometimes wrong by 1 microsecond
2012-12-01 10:24:02 +01:00
Remi Collet
c2554b4bb4
Fixed Bug #63435 Datetime::format('u') sometimes wrong by 1 microsecond
...
When storing '015700' microseconds in a Datetime object,
Datetime::format('u') returns '015699'
Already known per bug45554 reproducer (also fixed).
2012-12-01 10:20:39 +01:00
Xinchen Hui
093d119597
Merge branch 'PHP-5.4' into PHP-5.5
2012-11-30 14:30:37 +08:00
Xinchen Hui
b689819567
Merge branch 'PHP-5.3' into PHP-5.4
2012-11-30 14:29:59 +08:00
Xinchen Hui
40fabf68ed
Fixed bug #63398 (Segfault when polling closed link)
2012-11-30 14:28:32 +08:00
Dmitry Stogov
9e1d3cfdab
Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests)
2012-11-29 16:44:19 +04:00
Dmitry Stogov
7f7cff0bbb
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests)
Conflicts:
NEWS
ext/soap/soap.c
2012-11-29 16:41:09 +04:00
Dmitry Stogov
dc2192c087
Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests)
2012-11-29 16:31:08 +04:00
Dmitry Stogov
bf6fea6ba0
Fixed bug #61557 (Crasher in tt-rss backend.php)
2012-11-29 14:41:20 +04:00
Dmitry Stogov
1a09bf8023
Fixed bug #61557 (Crasher in tt-rss backend.php)
2012-11-29 14:38:18 +04:00
Anatoliy Belsky
f094723852
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
Conflicts:
NEWS
2012-11-27 16:55:47 +01:00
Anatoliy Belsky
d88017e992
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
Conflicts:
NEWS
ext/fileinfo/libmagic.patch
ext/fileinfo/tests/finfo_open_error-win32.phpt
2012-11-27 16:45:25 +01:00
Anatoliy Belsky
e6b727d3b7
Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
2012-11-27 16:33:58 +01:00
Anatoliy Belsky
17e21925c8
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
This test isn't supposed to pass on windows
2012-11-27 16:13:19 +01:00
Anatoliy Belsky
e0ad33c24a
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
This test isn't supposed to pass on windows
2012-11-27 16:11:53 +01:00
Anatoliy Belsky
eff12e56b6
This test isn't supposed to pass on windows
2012-11-27 16:02:55 +01:00
Xinchen Hui
8337c96656
Merge branch 'PHP-5.4' into PHP-5.5
2012-11-27 13:37:50 +08:00
Xinchen Hui
070239a194
Merge branch 'PHP-5.3' into PHP-5.4
2012-11-27 13:36:38 +08:00
Xinchen Hui
df3b9a1e07
Fixed Bug #63614 (Fatal error on Reflection)
2012-11-27 13:34:36 +08:00
Remi Collet
495ff0964d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Related bug #63588 fix length computation + optimize for speed
2012-11-26 13:05:37 +01:00
Remi Collet
7751a68824
Related bug #63588 fix length computation + optimize for speed
...
Following comment from Yoram "The patch looks fine, except of testing
for true value of utf16 in each iteration."
Also fix the length computation during check phase.
2012-11-26 12:59:08 +01:00
Remi Collet
f4a8612561
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #63588 Duplicate implementation of php_next_utf8_char
2012-11-25 08:21:10 +01:00
Remi Collet
289bb339c9
Fixed bug #63588 Duplicate implementation of php_next_utf8_char
...
Json use an utf8 parser from a third party library, switch to
our implementation of php_next_utf8_char.
This also helps on solving #63520 . All the unit tests succeed.
Our implementation also seems a little faster.
json.dsp need to be regenerated.
2012-11-25 08:14:23 +01:00
Remi Collet
c5d4ee9bed
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed Bug #63361 Header not installed
2012-11-25 07:48:44 +01:00
Remi Collet
8d2c44b59d
Fixed Bug #63361 Header not installed
...
ext/mysqli/php_mysqli_structs.h is installed and includes
mysqli_mysqlnd.h or mysqli_libmysql.h. So this header must also
be installed.
2012-11-25 07:46:02 +01:00
Remi Collet
966faa9a87
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed Bug #63149 Feature missing with system SQLite
2012-11-24 17:56:23 +01:00
Remi Collet
67e67c254d
Fixed Bug #63149 Feature missing with system SQLite
...
In pdo_sqlite, getColumnMeta should return the table name.
With bundled SQLite library, -DSQLITE_ENABLE_COLUMN_METADATA=1 (other_flags)
enable the feature in SQLite (function sqlite3_column_table_name).
With system SQLite library, this fix detects if sqlite3_column_table_name is
available and add SQLITE_ENABLE_COLUMN_METADATA macro to get the same behavior.
Test already exists: ext/pdo_sqlite/tests/bug_42589.phpt
2012-11-24 17:47:51 +01:00
Remi Collet
b620722196
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
add unit test for bug 63126
NEWS
2012-11-24 17:32:05 +01:00
Remi Collet
88d2b8c5fd
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
add unit test for bug 63126
NEWS
2012-11-24 17:31:18 +01:00
Remi Collet
92147243bf
add unit test for bug 63126
2012-11-24 17:30:48 +01:00
Remi Collet
f5156370b6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array
2012-11-24 15:03:09 +01:00
Remi Collet
7cd2f4b6a6
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array
2012-11-24 15:01:24 +01:00
Remi Collet
f55bed9dad
Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array
2012-11-24 15:00:03 +01:00
Anatoliy Belsky
8a84b1b5d9
Backported the fix for bug #63248 from 5.4+
2012-11-23 13:58:22 +01:00
Anatoliy Belsky
bc910a7ce4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed test for bug #63297
2012-11-22 19:05:31 +01:00
Anatoliy Belsky
dc862f4fd4
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed test for bug #63297
2012-11-22 19:04:49 +01:00
Anatoliy Belsky
1702024073
Fixed test for bug #63297
2012-11-22 19:01:09 +01:00
David Soria Parra
c733f28bd9
Add myself to QA
2012-11-21 18:42:01 +01:00
Xinchen Hui
6b0299aafc
Merge branch 'PHP-5.4' into PHP-5.5
2012-11-21 12:30:54 +08:00
Xinchen Hui
e54970aaf1
Unused variable copystr
...
copystr is declared again blow
2012-11-21 12:30:03 +08:00
Xinchen Hui
aba80d09e6
Update credits for 5.5
2012-11-21 12:17:41 +08:00
Pierrick Charron
30d659144a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value
2012-11-16 18:08:19 -05:00
Pierrick Charron
15ab75be8a
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value
2012-11-16 18:07:02 -05:00
Pierrick Charron
6dff07aa8c
Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value
...
Restore the old behavior but keep bug 51094 fixed
2012-11-16 18:04:14 -05:00
Anatoliy Belsky
36fadde72c
Fixed ext/intl/tests/timezone_createDefault_basic.phpt
...
Timezone offsets can be negative
2012-11-15 14:31:55 +01:00
Anatoliy Belsky
f85ae48f4f
Fixed ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
...
There is a constant now which only is there when mysqli with
mysqlnd and pdo_mysql was compiled at the same time, or when
libmysql version > 50605. So checking for that dynamically,
will fail only if there is no mysqli and no connection.
2012-11-14 21:18:16 +01:00
Anatoliy Belsky
bc9f8030c7
Fixed sockets ext build on win
2012-11-13 14:53:32 +01:00
Derick Rethans
dae05b2973
Merge branch 'PHP-5.4'
2012-11-13 10:17:21 +00:00
Derick Rethans
4f36aeb120
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
NEWS
2012-11-13 10:16:58 +00:00
Derick Rethans
00ad4c0e6a
- Updated to version 2012.10 (2012j)
2012-11-13 10:15:34 +00:00
Derick Rethans
1e081a825e
Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3
2012-11-13 10:10:41 +00:00
Derick Rethans
d9aea7cd4d
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
2012-11-13 10:10:28 +00:00
Derick Rethans
97f39ee1d7
Merge branch 'master' of git.php.net:/php-src
2012-11-13 10:10:10 +00:00
Adam Harvey
0b96b4c4e9
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Update arginfo for preg_match_all() to reflect reality.
fix invalid read when trimming empty string
2012-11-12 20:09:18 +08:00
Adam Harvey
bca8ff723d
Update arginfo for preg_match_all() to reflect reality.
...
Back when I implemented FR #53238 during the 5.4 development phase to make the
$matches parameter optional in preg_match_all(), it turns out I forgot to
update the arginfo to note that only 2 parameters are now required by
preg_match_all(). The function itself works fine, but reflection was reporting
the wrong number of required parameters.
2012-11-12 20:04:26 +08:00
Antony Dovgal
4029475e82
fix invalid read when trimming empty string
2012-11-11 22:38:18 +04:00
Antony Dovgal
5b82fb52fd
fix invalid read when trimming empty string
2012-11-11 22:38:14 +04:00
Antony Dovgal
bb60122c2f
fix invalid read when trimming empty string
2012-11-11 22:37:04 +04:00
Xinchen Hui
b936a815fb
Merge branch 'PHP-5.4'
2012-11-07 17:09:27 +08:00
Xinchen Hui
e222837f6e
Merge branch 'PHP-5.3' into PHP-5.4
2012-11-07 17:08:34 +08:00
Xinchen Hui
7fcbe4d546
Fixed bug #63447 (max_input_vars doesn't filter variables when mbstring.encoding_translation = On)
2012-11-07 17:05:24 +08:00
Rasmus Lerdorf
a983ded9bd
Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
2012-11-05 20:58:04 -08:00
Rasmus Lerdorf
f8c280d85a
These need to be volatile in order to prevent leaking after the
...
longjmp in the error handler
2012-11-05 20:57:15 -08:00
Rasmus Lerdorf
f452b9056e
These need to be volatile in order to prevent leaking after the
...
longjmp in the error handler
2012-11-05 20:57:07 -08:00
Rasmus Lerdorf
261e32f623
These need to be volatile in order to prevent leaking after the
...
longjmp in the error handler
2012-11-05 20:56:19 -08:00
Derick Rethans
37cc133d6f
Merge branch 'PHP-5.4'
2012-11-04 16:24:07 +00:00
Derick Rethans
db0f623490
Merge branch 'PHP-5.3' into PHP-5.4
2012-11-04 16:24:02 +00:00
Derick Rethans
1784279be0
- Updated to version 2012.9 (2012i)
2012-11-04 16:23:58 +00:00
Andrey Hristov
9acc2367b1
Merge branch 'PHP-5.4'
2012-10-31 19:04:10 +01:00
Andrey Hristov
965bd32fec
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-31 18:29:31 +01:00
Andrey Hristov
a17559d422
read 1 instead of 2 bytes. The next 2 bytes are 2 and thus not a problem
2012-10-31 18:26:09 +01:00
Johannes Schlüter
44b1a07d85
Allow setting SHA256 auth public key as option
2012-10-31 16:54:11 +01:00
Andrey Hristov
a0a34f5bca
plug recent leak
2012-10-31 16:13:00 +01:00
Andrey Hristov
f2f380407a
Merge branch 'master' of ssh://git.php.net/php-src
2012-10-31 15:55:04 +01:00
Andrey Hristov
d62bc53a4f
cosmetics
2012-10-31 15:54:45 +01:00
Xinchen Hui
8fb26e76ba
Merge branch 'PHP-5.4'
2012-10-31 11:14:53 +08:00
Xinchen Hui
7886f46b56
Fixed bug #63399 (ReflectionClass::getTraitAliases() incorrectly resolves traitnames)
2012-10-31 11:13:32 +08:00
David Soria Parra
1af3d9d6c9
Merge branch 'PHP-5.4'
...
* PHP-5.4:
NEWS for bug #62593
Bug #62593 Updated to account for INOUT parameters
Bug #62593 Updated test to verify bindParam doesn't change original value
Bug #62593 Updated to always treat zval by value
Bug #62593 Added test for change
Bug #62593 Updated pdo_pgsql driver to convert boolean values to pg native format in emulation mode
2012-10-30 15:43:56 +01:00
David Soria Parra
440bbcd9e3
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
NEWS for bug #62593
Bug #62593 Updated to account for INOUT parameters
Bug #62593 Updated test to verify bindParam doesn't change original value
Bug #62593 Updated to always treat zval by value
Bug #62593 Added test for change
Bug #62593 Updated pdo_pgsql driver to convert boolean values to pg native format in emulation mode
2012-10-30 15:43:32 +01:00
Will Fitch
d864063a18
Bug #62593 Updated to account for INOUT parameters
2012-10-30 14:32:32 +01:00
Will Fitch
d922e801ee
Bug #62593 Updated test to verify bindParam doesn't change original value
2012-10-30 14:32:27 +01:00
Will Fitch
646c0e5738
Bug #62593 Updated to always treat zval by value
2012-10-30 14:32:22 +01:00
Will Fitch
f0835c002d
Bug #62593 Added test for change
2012-10-30 14:32:16 +01:00
Will Fitch
7ea4f73ad4
Bug #62593 Updated pdo_pgsql driver to convert boolean values to pg native format in emulation mode
2012-10-30 14:32:09 +01:00
Xinchen Hui
cc1caf92ea
Merge branch 'PHP-5.4'
2012-10-30 11:11:22 +08:00
Xinchen Hui
3342e7276c
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-30 11:10:26 +08:00
Xinchen Hui
2f1c4064f8
Fixed bug #63389 (Missing context check on libxml_set_streams_context() causes memleak)
...
Simply change the expect parameter type, the valid of the resource will
be checked in using time.
2012-10-30 11:08:14 +08:00
Derick Rethans
c511ee3d64
Merge branch 'PHP-5.4'
2012-10-27 15:19:59 +01:00
Derick Rethans
4c08ee069c
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-27 15:19:55 +01:00
Derick Rethans
b5344e267a
- Updated to version 2012.8 (2012h)
2012-10-27 15:19:54 +01:00
Dmitry Stogov
0716ddcdb2
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #63180 (Corruption of hash tables)
fix bug #63369
Conflicts:
NEWS
2012-10-26 09:49:21 -07:00
Dmitry Stogov
68b229ea73
Fixed bug #63180 (Corruption of hash tables)
2012-10-26 09:47:30 -07:00
Antony Dovgal
01dee2c4b0
fix bug #63369
...
(un)serialize() leaves dangling pointers, causes crashes
2012-10-26 16:42:21 +04:00
Antony Dovgal
f2bffdc2e4
fix bug #63369
...
(un)serialize() leaves dangling pointers, causes crashes
2012-10-26 16:41:14 +04:00
Johannes Schlüter
d21d909072
Merge branch 'PHP-5.4'
2012-10-26 14:23:22 +02:00
Johannes Schlüter
4f4d77805c
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
ext/pdo_mysql/mysql_statement.c
2012-10-26 14:22:31 +02:00
ULF WENDEL
5d4c691e51
Merge branch 'PHP-5.4'
...
* PHP-5.4:
This won't make the test pass but now its at least one that shows no unnecessary error messages...
2012-10-26 12:32:39 +02:00
ULF WENDEL
056ecf3201
This won't make the test pass but now its at least one that shows no unnecessary error messages...
2012-10-26 12:32:10 +02:00
John Jawed (JJ)
f68f31f121
Notice if CURLOPT_SSL_VERIFYHOST is set to true
2012-10-25 16:00:02 -04:00
Anthony Ferrara
18da63e5be
Merge in fix for bug 63363 (CURL silently accepts boolean true for SSL_VERIFYHOST
...
Merge in a fix to raise a notice when a boolean true is passed into curl_setopt for CURLOPT_SSL_VERIFYHOST.
2012-10-25 15:30:37 -04:00
John Jawed (JJ)
3b85d09de7
Notice if CURLOPT_SSL_VERIFYHOST is set to true
2012-10-25 12:22:23 -07:00
Anatoliy Belsky
071f217388
Merge branch 'PHP-5.4'
...
* PHP-5.4:
enabled libxpm for gd on windows
2012-10-24 10:37:23 +02:00
Anatoliy Belsky
e3ac418309
enabled libxpm for gd on windows
2012-10-24 10:36:52 +02:00
ULF WENDEL
7c00017671
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
commented out the HHC_LOCATION line, as there are no easy to use alternatives for hhc.exe on linux. we should either run the chm build on a windows box(maybe on the replacement of oti1), or look into running it through wine see http://cweiske.de/tagebuch/Generating%20CHM%20files%20with%20Wine%20on%20a%20Linux%20server,%20and%20a%20bit%20about%20PEAR's%20PhD%20transition.htm for details. I also set DOT_CLEANUP to NO as the doc generation was spitting out errors regarding some dot file cannot be found.
2012-10-23 15:14:59 +02:00
Ferenc Kovacs
240f8d06de
commented out the HHC_LOCATION line, as there are no easy to use alternatives for
...
hhc.exe on linux.
we should either run the chm build on a windows box(maybe on the replacement of oti1),
or look into running it through wine see
http://cweiske.de/tagebuch/Generating%20CHM%20files%20with%20Wine%20on%20a%20Linux%20server,%20and%20a%20bit%20about%20PEAR's%20PhD%20transition.htm
for details.
I also set DOT_CLEANUP to NO as the doc generation was spitting out errors regarding some dot
file cannot be found.
2012-10-25 17:11:13 +02:00
ULF WENDEL
b8595e1d40
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix for bug #62820
2012-10-23 15:14:45 +02:00
ULF WENDEL
0737be7e7b
Fix for bug #62820
2012-10-23 15:13:57 +02:00
ULF WENDEL
848780606d
Fix for bug #62820 well hidden beneath a ton of whitespace changes. Do not use this pdo factory stuff - you get a line with an error on it, use the mysql stuff in the tests
2012-10-23 14:58:16 +02:00
Anatoliy Belsky
f962260081
merged changes for bug #63297 from 5.3
2012-10-25 09:40:21 +02:00
Anatoliy Belsky
6e23cfeba4
fixed a typo in the error message
2012-10-25 09:26:44 +02:00
Anatoliy Belsky
a88379e03d
Fixed bug #63297 Phar fails to write an openssl based signature
...
Unitialized values warnings seem to be everyday life
when working with openssl. For more read
http://www.openssl.org/support/faq.html#PROG13
So just fixing so the bug, no care about those
warnings.
2012-10-24 13:38:44 +02:00
Anatoliy Belsky
b48e163c35
enabled libxpm for gd on windows
2012-10-24 10:26:27 +02:00
ULF WENDEL
e7fc671dc0
Deprecating undocumented function alias, related to bug #63295
2012-10-23 12:02:58 +02:00
Gustavo Lopes
e7e57aea0a
Use if_nametoindex in Vista
...
I missed this instance in bf19838c
.
2012-10-23 11:52:31 +02:00
Anatoliy Belsky
f734c0a7ca
Merge branch 'PHP-5.4'
...
* PHP-5.4:
merged changes for bug #63297 from 5.3
Conflicts:
NEWS
2012-10-25 09:42:18 +02:00
Andrey Hristov
91ce3764f0
Merge branch 'master' of ssh://git.php.net/php-src
2012-10-22 14:36:16 +02:00
Andrey Hristov
27e0999843
fix crashes in newly introduced macros when normal trace is disabled but
...
memory traced is enabled.
2012-10-22 14:35:35 +02:00
Christopher Jones
0afca66958
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
2012-10-21 22:22:07 -07:00
Christopher Jones
7d59b2264e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
2012-10-21 22:21:46 -07:00
Christopher Jones
dbb72de6c7
Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
...
The original fix broke Solaris installs of OCI8
2012-10-21 22:17:47 -07:00
Anatoliy Belsky
8b0704618f
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #63284 PCRE upgrade to 8.31
2012-10-19 09:52:43 +02:00
Anatoliy Belsky
d2fa182f25
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #63284 PCRE upgrade to 8.31
2012-10-19 09:51:58 +02:00
Anatoliy Belsky
276c5de0d8
Fixed bug #63284 PCRE upgrade to 8.31
2012-10-19 09:49:28 +02:00
Xinchen Hui
6444eef27b
Update libmagic.patch
2012-10-19 11:14:14 +08:00
Christopher Jones
25ebd50553
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #63307 (Unused variable in oci8.c)
Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
2012-10-18 17:58:36 -07:00
Christopher Jones
85b0eda4c8
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #63307 (Unused variable in oci8.c)
Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
2012-10-18 17:57:19 -07:00
Christopher Jones
af14da5714
Fixed bug #63307 (Unused variable in oci8.c)
...
An output section for oci_internal_debug() was setting but not using a variable
2012-10-18 17:53:00 -07:00
Christopher Jones
79a048f76f
Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3
...
* 'PHP-5.3' of https://git.php.net/repository/php-src :
- Updated to version 2012.7 (2012g)
SUpport newer bisons.
Merge the fix for #61964 to 5.3, which will fix #63304
indent
better fix for #63055
Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
PHP 5.3.18 NEWS
fix NEWS
fix compilation failure on 32/64bit linux systems, when libmysql is used with ext/mysql
Cover have_ssl=NO and have_ssl=DISABLED
Minor changes for MySQL 5.6
NEWS for 76601c4
Fix bug #63240 on stream_get_line()
extended the SKIPIF section with ICU 49 (sync with 5.4 branch)
fixed tests for gd having freetype >= 2.4.10
2012-10-18 17:37:21 -07:00
Christopher Jones
131dd88505
Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
...
Improve high availability for explicitly terminated connections.
2012-10-18 17:33:51 -07:00
Derick Rethans
51fe5bcd09
Merge branch 'PHP-5.4'
2012-10-18 21:53:08 +01:00
Derick Rethans
4980b24025
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-18 21:53:04 +01:00
Derick Rethans
8f7a6c3029
- Updated to version 2012.7 (2012g)
2012-10-18 21:53:03 +01:00
Xinchen Hui
0d7965f0a3
Merge the fix for #61964 to 5.3, which will fix #63304
2012-10-18 23:29:33 +08:00
Andrey Hristov
8219b02579
Merge branch 'master' of ssh://git.php.net/php-src
2012-10-18 15:15:32 +02:00