Andrew Faulds
4ec29b945c
relative-scheme
2012-08-19 22:16:07 -07:00
Andrew Faulds
36b88d77f2
bug #62844 ; relative URL schemes in parse_url()
2012-08-19 22:15:58 -07:00
Felipe Pena
64e4279642
Merge branch 'PHP-5.4'
...
* PHP-5.4:
- Value stored to var is never used
2012-08-19 14:50:54 -03:00
Felipe Pena
d6e6db4501
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Value stored to var is never used
2012-08-19 14:50:52 -03:00
Felipe Pena
3dd256a67b
- Value stored to var is never used
2012-08-19 14:50:49 -03:00
Felipe Pena
01c3e0e62c
Merge branch 'PHP-5.4'
...
* PHP-5.4:
- Value stored to var is never used
2012-08-19 14:34:46 -03:00
Felipe Pena
9d8d84ebdf
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Value stored to var is never used
2012-08-19 14:34:42 -03:00
Felipe Pena
50ab6c63a7
- Value stored to var is never used
2012-08-19 14:34:38 -03:00
Felipe Pena
2b685075b5
- Remove unused variable
2012-08-19 11:35:18 -03:00
Xinchen Hui
3d93c88811
Merge branch 'PHP-5.4'
2012-08-17 18:30:03 +08:00
Xinchen Hui
0b23da1c74
Fixed bug #62836 (Seg fault or broken object references on unserialize())
2012-08-17 18:28:32 +08:00
Nikita Popov
9a38bd66c8
Fix php_ini_loaded_file() test
...
If running ./run-tests.php directly there isn't necessarily an ini file,
so the function can also return false.
2012-08-16 17:46:34 +02:00
Xinchen Hui
8848778a59
Merge fix e7535e06e6
to 5.3
...
thanks for reeze.xia@gmail.com notice this
2012-08-15 01:06:10 +08:00
Xinchen Hui
dacd918dc7
Merge branch 'PHP-5.4'
2012-08-14 14:03:56 +08:00
Xinchen Hui
8091256948
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-14 14:03:05 +08:00
Xinchen Hui
da14cdd6f3
Merge branch 'skip-memory-exhaust-tests' of https://github.com/reeze/php-src into PHP-5.3
2012-08-14 13:58:15 +08:00
Nikita Popov
7066be50c0
Merge remote-tracking branch 'reeze/fix-phpcredits-bc'
2012-08-13 21:23:06 +02:00
Nikita Popov
f4ce364628
Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport
...
This is just an intial merge. It does not yet make generators and finally
work together.
Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Zend/zend_vm_execute.skl
Zend/zend_vm_opcodes.h
2012-08-13 16:54:53 +02:00
Xinchen Hui
253760bb6b
Merge branch 'PHP-5.4'
2012-08-12 21:00:01 +08:00
Xinchen Hui
dda0565b53
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-12 20:58:45 +08:00
Xinchen Hui
4970926e45
Fixed bug #62763 (register_shutdown_function and extending class)
2012-08-12 20:58:09 +08:00
Reeze Xia
0239437903
Skip tests reply on Zend MM turned on
...
Those two tests have expect memory exhausted fatal error
2012-08-11 00:34:37 +08:00
Reeze Xia
3d4169d751
Fix phpcredits() BC after remove Logo GUIDs
...
This test was affected: ext/standard/tests/general_functions/phpcredits2.phpt
see https://github.com/php/php-src/pull/132/files#diff-3
This makes constant PHP_CREDITS_FULLPAGE didn't functional anymore.
2012-08-09 21:43:59 +08:00
Stanislav Malyshev
054e41f4ae
Merge branch 'PHP-5.4'
...
* PHP-5.4:
News for bug#40459
fix bug #40459 - make all stream funcs that create object call ctor
2012-08-09 00:12:22 -07:00
Stanislav Malyshev
4db70fd406
fix bug #40459 - make all stream funcs that create object call ctor
2012-08-07 22:59:12 -07:00
Stanislav Malyshev
c9eb64127e
Merge branch 'pull-request/132'
...
* pull-request/132:
OK, bye bye JavaScript, let's just include credits before license
Nicer (JSLint-compliant!) credits reveal JavaScript
Removed now-unnecessary expose_php checks for logo
Fixed small misalignment in prev commit
Removed Logo GUIDs and replaced with Data URIs and div hidden with JS
2012-08-05 21:15:53 -07:00
Stanislav Malyshev
13763c76db
Merge branch 'PHP-5.4'
...
* PHP-5.4:
var_export outputs an E_WARNING when recursion is detected
2012-08-05 20:58:46 -07:00
Lonny Kapelushnik
45f3322905
var_export outputs an E_WARNING when recursion is detected
2012-08-05 20:56:06 -07:00
Xinchen Hui
6f9b638aed
Merge branch 'PHP-5.4'
2012-08-02 19:24:23 +08:00
Xinchen Hui
6fb9a6922d
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
ext/standard/tests/file/realpath_cache.phpt
2012-08-02 19:23:04 +08:00
Xinchen Hui
9a690859f6
fix test due to float value
2012-08-02 19:14:06 +08:00
Xinchen Hui
9c73c8d58d
Merge branch 'PHP-5.4'
2012-07-29 14:31:22 +08:00
Xinchen Hui
e0c014dead
Merge branch 'PHP-5.3' into PHP-5.4
2012-07-29 14:31:04 +08:00
Xinchen Hui
f419d614ba
Sike test while there is no zend mm max_size guard
2012-07-29 14:30:01 +08:00
Felipe Pena
777160f7b5
Merge branch 'PHP-5.4'
...
* PHP-5.4:
- Fixed ZTS build
Updated NES
2012-07-24 10:02:43 -03:00
Felipe Pena
54cba5aa91
- Fixed ZTS build
2012-07-24 10:02:32 -03:00
Florian Anderiasch
81de111131
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Add syslog support to mail.log #62356
2012-07-24 14:34:41 +02:00
Florian Anderiasch
ddc8d16245
Add syslog support to mail.log #62356
...
Patch by Michael Orlitzky
2012-07-24 14:31:30 +02:00
Andrew Faulds
b1a997e2a2
OK, bye bye JavaScript, let's just include credits before license
2012-07-23 00:11:00 +01:00
Xinchen Hui
ead076bac6
Fix test failed
2012-07-21 23:27:09 +08:00
Xinchen Hui
683b4f7a2b
merge 9eb5cb6571
to 5.3
2012-07-21 00:46:32 +08:00
Xinchen Hui
da7cd966ff
Merge branch 'PHP-5.4'
...
* PHP-5.4:
this initialization is unnecessary anymore after commit 2d9d2cadad
2012-07-18 21:49:46 +08:00
Xinchen Hui
b81b8bf77d
this initialization is unnecessary anymore after commit 2d9d2cadad
2012-07-18 21:45:37 +08:00
Xinchen Hui
e7535e06e6
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #62597 (segfault in php_stream_wrapper_log_error with ZTS build)
2012-07-18 20:17:42 +08:00
Xinchen Hui
2d9d2cadad
Fixed bug #62597 (segfault in php_stream_wrapper_log_error with ZTS build)
2012-07-18 20:16:27 +08:00
Xinchen Hui
2ed4026518
Merge branch 'PHP-5.4'
...
* PHP-5.4:
skip for ZTS
2012-07-18 19:48:27 +08:00
Xinchen Hui
11d0558928
skip for ZTS
2012-07-18 19:47:54 +08:00
Xinchen Hui
44462955f8
Merge branch 'PHP-5.4'
...
* PHP-5.4:
fix test (dos2unix, typo)
2012-07-18 19:25:56 +08:00
Xinchen Hui
282a6659aa
fix test (dos2unix, typo)
2012-07-18 19:25:22 +08:00
Xinchen Hui
ecc960e862
Merge branch 'PHP-5.4'
...
* PHP-5.4:
fix test, the key may be a float value
2012-07-18 19:22:13 +08:00
Xinchen Hui
41a9c681a0
fix test, the key may be a float value
2012-07-18 19:21:25 +08:00
Gustavo André dos Santos Lopes
08302e3d03
Merge branch '5.4'
...
* 5.4:
NEWS for b47d6b32
Fix test fails: ext/standard/tests/general_functions/bug27678.phpt
2012-07-17 23:13:43 +02:00
Reeze Xia
b47d6b32ba
Fix test fails: ext/standard/tests/general_functions/bug27678.phpt
...
After commit 3e62aae1
, number_format() returns string with length,
but _php_math_number_format_ex_len() didn't set string length
on nan and inf. This cause segfault when destruct the return value.
2012-07-17 23:08:11 +02:00
Andrew Faulds
c7c2fb0158
Nicer (JSLint-compliant!) credits reveal JavaScript
2012-07-15 14:41:53 +01:00
Stanislav Malyshev
05f4e3e52a
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Typofix in test-description
2012-07-14 22:08:27 -07:00
Stanislav Malyshev
cfdccdb805
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Typofix in test-description
2012-07-14 22:08:19 -07:00
Jille Timmermans
86b4252c8e
Typofix in test-description
2012-07-14 22:07:50 -07:00
Stanislav Malyshev
6bfea28ce3
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixing up closing tag
Testing variation on input parameters of http_build_query() function
2012-07-14 19:00:35 -07:00
Adam Gegotek
8b70dd202a
Fixing up closing tag
2012-07-14 18:59:04 -07:00
Adam Gegotek
152f73f92a
Testing variation on input parameters of http_build_query() function
2012-07-14 18:58:52 -07:00
Andrew Faulds
ee6540ad09
Removed now-unnecessary expose_php checks for logo
2012-07-14 23:20:45 +01:00
Stanislav Malyshev
3b0573363a
fix comment
2012-07-14 14:50:50 -07:00
Stanislav Malyshev
582514d4c7
fix for bug#18556 - use simple tolower() function for internal things
2012-07-14 14:50:50 -07:00
Andrew Faulds
92d2aeb234
Fixed small misalignment in prev commit
2012-07-14 21:55:11 +01:00
Andrew Faulds
d12f8d6790
Removed Logo GUIDs and replaced with Data URIs and div hidden with JS
...
- removed php_logo_guid()
- removed php_egg_logo_guid()
- removed php_real_logo_guid()
- removed zend_logo_guid()
- removed logo GUID handling
- removed logo GUIDs from source
- added logo data URIs instead for phpinfo()
- added credits to phpinfo() page, but hidden by default
2012-07-14 21:44:21 +01:00
Felipe Pena
f94051ea11
- Fix conflict
2012-07-14 12:23:24 -03:00
Felipe Pena
0bff7cfadd
- Fixed bug #62565 (Crashes due non-initialized internal properties_table)
2012-07-14 12:16:16 -03:00
Anthony Ferrara
707c9073b5
Switch second parameter to password_make_salt to be a flag
2012-07-11 22:15:56 -04:00
Anthony Ferrara
99b7956ad5
Merge remote branch 'upstream/master' into hash_password
...
* upstream/master: (34 commits)
Fixed Bug #62500 (Segfault in DateInterval class when extended)
Fixed test bug #62312 (warnings changed one more time)
fix valgrind warning
fix valgrind warning
fixed #62433 test for win
update NEWS
Fixed bug #62499 (curl_setopt($ch, CURLOPT_COOKIEFILE, "") returns false)
appease MSVC (doesnt like unary minus of unsigned ints)
appease MSVC (doesnt like unary minus of unsigned ints)
appease MSVC (doesnt like unary minus of unsigned ints)
- Fixed bug #62507 (['REQUEST_TIME'] under mod_php5 returns miliseconds instead of seconds)
Fixed Bug #62500 (Segfault in DateInterval class when extended)
Added in NEWS and UPGRADING for feature 55218
Fix two issues with run-tests.php
Fix potential integer overflow in nl2br
Fix potential integer overflow in bin2hex
This wil be PHP 5.3.16
Revert change 3f3ad30c50
: There shouldn't be new features in 5.3, especially not if they aren't in 5.4, too.
fix (signed) integer overflow (part of bug #52550
fix (signed) integer overflow (part of bug #52550
...
2012-07-10 10:33:51 -04:00
Anthony Ferrara
9d3630b5dc
Cleanup whitespace issues
2012-07-05 17:58:19 -04:00
Anthony Ferrara
ee7e799841
Implement password_get_info() function
2012-07-05 17:46:33 -04:00
Anthony Ferrara
db86d54446
Fix issue with int vs long parameter
2012-07-05 17:31:40 -04:00
Anthony Ferrara
5160dc11cd
Implement password_needs_rehash() function
2012-07-05 16:22:49 -04:00
Nikita Popov
ed54357fcd
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix potential integer overflow in nl2br
Fix potential integer overflow in bin2hex
2012-07-05 21:00:16 +02:00
Nikita Popov
5cf2f87fa7
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix potential integer overflow in nl2br
Fix potential integer overflow in bin2hex
Conflicts:
ext/standard/string.c
2012-07-05 20:59:18 +02:00
Nikita Popov
157ddd9577
Fix potential integer overflow in nl2br
...
The buffer size was calculated manually, thus creating integer overflows
for very large inputs, e.g. nl2br(str_repeat("\n", 613566757)).
The code now uses safe_emalloc, thus making the code throw an error
instead of crashing.
2012-07-05 20:41:54 +02:00
Nikita Popov
88f46b162b
Fix potential integer overflow in bin2hex
...
The code was already using safe_emalloc but did the multiplication in
the first argument, thus making the use of safe_emalloc pretty useless.
The *2 is now moved to the second argument.
2012-07-05 20:14:49 +02:00
Anthony Ferrara
886527de56
Update signature info for changing algo to an ordinal
2012-07-03 08:26:50 -04:00
Anthony Ferrara
6943f2ab7f
Some more refactoring, make algo no longer optional
2012-07-03 08:24:31 -04:00
Anthony Ferrara
6cc3c65fbf
Remove php.ini setting for default bcrypt cost
2012-07-03 07:33:55 -04:00
Stanislav Malyshev
a3322f8927
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed the common misspelling of the word occurred (occured -> occurred)
2012-06-30 17:00:25 -07:00
Marc Easen
896ac689c9
Fixed the common misspelling of the word occurred (occured -> occurred)
2012-06-30 16:54:03 -07:00
Anthony Ferrara
f53112fdcf
Update password.c to use safe_emalloc in sensitive places
2012-06-29 11:37:39 -04:00
Anthony Ferrara
9c1445c6bc
More refactoring of crypt into php_crypt, and fixing memory allocation
2012-06-29 11:32:25 -04:00
Anthony Ferrara
9e18e578f0
Merge remote branch 'upstream/master' into hash_password
...
Conflicts:
ext/standard/crypt.c
2012-06-29 10:29:58 -04:00
Nikita Popov
0b96fb4af5
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix some lengths in crypt()
2012-06-29 13:15:53 +02:00
Nikita Popov
d86b6ea35c
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix some lengths in crypt()
Conflicts:
ext/standard/crypt.c
2012-06-29 13:15:35 +02:00
Nikita Popov
e6cf7d7745
Fix some lengths in crypt()
...
Use salt_len_in instead of strlen(salt) or PHP_MAX_SALT_LEN, otherwise too
much memory will be allocated.
sha512 has a 86 character checksum, not 43. That probably was a copy&paste
from the sha256 code which indeed has 43.
The allocation also was using sizeof(char *), thus allocating 4 or 8 times
as much memory as necessary. The sizeof(char *) was removed in the 5.4
branch in b7a92c9
but forgotten on 5.3.
The memset 0 call was using PHP_MAX_SALT_LEN which can be smaller than the
output buffer and thus not zeroing out everything. Use the size of the
output buffer (needed) instead.
2012-06-29 13:11:43 +02:00
Anthony Ferrara
63318772ae
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed Salt)
2012-06-28 20:38:31 -04:00
Anthony Ferrara
34ab5650bc
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed Salt)
2012-06-28 20:36:21 -04:00
Anthony Ferrara
7e8276ca68
Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed Salt)
...
Fixed a memory allocation bug in crypt() SHA256/512 that can
cause segmentation faults when passed in salts with a null byte
early.
2012-06-28 20:00:03 -04:00
Anthony Ferrara
da3d8bf514
Refactor password.c a bit, add different error checking
2012-06-28 15:29:40 -04:00
Anthony Ferrara
6bb3865a23
Refactor crypt to use an external working function
2012-06-28 14:44:04 -04:00
Anthony Ferrara
0dd2f16b14
Fix formatting issues in password.c
2012-06-27 11:04:41 -04:00
Anthony Ferrara
5f44be03af
Add tests and error checking for large salt requested values to prevent overflow on allocation
2012-06-26 23:09:08 -04:00
Anthony Ferrara
2b9591f11f
Update tests to check ini setting
2012-06-26 22:13:51 -04:00
Anthony Ferrara
e505316aeb
Add tests for password hashing
2012-06-26 22:05:25 -04:00
Anthony Ferrara
232da90388
Implement php.ini setting password.bcrypt_cost
2012-06-26 21:15:56 -04:00
Anthony Ferrara
2d4b7cb653
Refactor salt generation, rename password_create to password_hash
2012-06-25 21:22:16 -04:00
Anthony Ferrara
41d7374ea4
Implement openssl support for make_salt
2012-06-25 11:37:48 -04:00
Anthony Ferrara
618f262956
More error checking, and some cleaning up for password.c
2012-06-25 08:50:39 -04:00
Anthony Ferrara
18d3bd9481
Basic random generator added to make_salt
2012-06-25 08:15:17 -04:00
Moriyoshi Koizumi
88cf472b92
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix bug #62373 (serialize() generates wrong reference to the object)
2012-06-25 19:16:40 +09:00
Moriyoshi Koizumi
91e1df704e
Fix bug #62373 (serialize() generates wrong reference to the object)
2012-06-25 19:14:19 +09:00
Moriyoshi Koizumi
e427182279
Fix bug #62373 (serialize() generates wrong reference to the object)
2012-06-25 19:13:23 +09:00
Anthony Ferrara
f7097d99ff
Fix memory leak on branch
2012-06-24 23:36:09 -04:00
Anthony Ferrara
657402832b
Implement password_verify
2012-06-24 23:35:26 -04:00
Anthony Ferrara
7e41980fe4
Actually complete password_create()
2012-06-24 23:25:18 -04:00
Anthony Ferrara
c77f2c2958
Base structure for passsword_create and password_make_salt
2012-06-24 22:44:43 -04:00
Nikita Popov
ee8b9d5c6f
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix memory allocation checks for base64 encode
2012-06-25 00:09:05 +02:00
Nikita Popov
ad641950b3
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix memory allocation checks for base64 encode
2012-06-24 23:56:55 +02:00
Nikita Popov
5b3f4d25ea
Fix memory allocation checks for base64 encode
...
base64_encode used safe_emalloc, but one of the arguments was derived from a
multiplication, thus making the allocation unsafe again.
There was a size check in place, but it was off by a factor of two as it
didn't account for the signedness of the integer type.
The unsafe allocation is not exploitable, but still causes funny behavior
when the sized overflows into a negative number.
To fix the issue the *4 factor is moved into the size argument (where it is
known to be safe), so safe_emalloc can carry out the multiplication.
The size check is removed as it doesn't really make sense once safe_emalloc
works correctly. (Would only cause base64_encode to silently return false
instead of throwing an error. Also could cause problems with other uses of
the base64 encoding API, which all don't check for a NULL return value.)
Furthermore the (length + 2) < 0 check is replaced with just length < 0.
Allowing lengths -2 and -1 doesn't make sense semantically and also is not
honored in the following code (negative length would access unallocated
memory.)
Actually the length < 0 check doesn't make sense altogether, but I left it
there just to be safe.
2012-06-24 23:32:50 +02:00
Johannes Schlüter
21cbe30be3
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Remove extra ;
2012-06-22 17:33:38 +02:00
Johannes Schlüter
5e23a047ac
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Remove extra ;
2012-06-22 17:33:22 +02:00
Johannes Schlüter
a62d4e2c43
Remove extra ;
2012-06-22 17:32:46 +02:00
Stanislav Malyshev
784b4cddc6
simplify boolval()
2012-06-13 12:03:36 -07:00
Pierrick Charron
5b10a65617
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that includes a semi-colon)
2012-06-07 17:51:56 +02:00
Pierrick Charron
494c170e6f
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that includes a semi-colon)
2012-06-07 17:45:43 +02:00
Pierrick Charron
fed5923dbc
Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that includes a semi-colon)
...
Modify the scanner to check if the first char of the raw data is an opening " in which case we
need to find the closing one. Otherwise just search for the next end of value char [\r\n;\000]
2012-06-07 17:44:20 +02:00
Jille Timmermans
74b4ef5036
Implement boolval() with a test
2012-06-06 22:34:51 +02:00
Xinchen Hui
4770fe2c97
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Typofix in comment in proc_open.c
2012-05-30 14:44:35 +08:00
Xinchen Hui
7511f972fd
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Typofix in comment in proc_open.c
2012-05-30 14:43:55 +08:00
Jille Timmermans
a331f43f8c
Typofix in comment in proc_open.c
2012-05-30 14:42:39 +08:00
Stanislav Malyshev
f428578138
Merge branch 'PHP-5.4'
...
* PHP-5.4:
fix CVE-2012-2143
2012-05-29 23:14:09 -07:00
Stanislav Malyshev
692b3bcd88
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix CVE-2012-2143
2012-05-29 23:08:04 -07:00
Stanislav Malyshev
aab49e934d
fix CVE-2012-2143
2012-05-29 23:07:04 -07:00
Nuno Lopes
af2d6a63bf
remove remaining traces of unicode.* ini settings
2012-05-27 19:57:34 -04:00
Anatoliy Belsky
c8d8d2442e
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #62149 Test Bug - ext/curl/tests/bug61948
Fixed bug #62148 mail_skipif doesn't skip imap tests on Release Build
2012-05-25 10:53:09 +02:00
Anatoliy Belsky
16a592b13a
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #62149 Test Bug - ext/curl/tests/bug61948
Fixed bug #62148 mail_skipif doesn't skip imap tests on Release Build
2012-05-25 10:52:38 +02:00
Matt Ficken
4aac4da673
Fixed bug #62148 mail_skipif doesn't skip imap tests on Release Build
2012-05-25 10:34:33 +02:00
Anatoliy Belsky
e2daa69b62
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #62147 test bug - popen_pclose_basic-win32
2012-05-25 10:05:23 +02:00
Anatoliy Belsky
6fb0e4a401
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #62147 test bug - popen_pclose_basic-win32
2012-05-25 09:55:53 +02:00
Matt Ficken
d4d36fba28
Fixed bug #62147 test bug - popen_pclose_basic-win32
2012-05-25 09:53:51 +02:00
Anatoliy Belsky
1d30fb4c04
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #62140 ext\standard\tests\file\tempnam_variation7-win32.phpt fails
2012-05-24 13:59:57 +02:00
Anatoliy Belsky
72c7cfe6f2
Fixed bug #62140 ext\standard\tests\file\tempnam_variation7-win32.phpt fails
2012-05-24 13:58:42 +02:00
Anatoliy Belsky
674a04dfc7
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix bug #62139 ext\standard\tests\file\rename_variation13-win32.phpt fails
2012-05-24 13:27:24 +02:00
Anatoliy Belsky
0e12a778df
Fix bug #62139 ext\standard\tests\file\rename_variation13-win32.phpt fails
2012-05-24 13:26:32 +02:00
Anatoliy Belsky
0dc9b0e708
Fixed bug #62138 ext\standard\tests\dir\dir_variation8-win32.phpt fails
2012-05-24 12:39:00 +02:00
Gustavo André dos Santos Lopes
adf2fba307
Merge branch '5.4'
2012-05-23 11:37:45 +02:00
Gustavo André dos Santos Lopes
3e62aae1b4
Fix bug #62112 : number_format() is not binary safe
...
The bug report actually urges PHP 5.3's behavior to be
reinstated -- that is, make "\0", when used as a separator,
be the same as no separator at all. I believe that is not a
proper course of action and that "\0" being interpreted as
no seperator was a bug in PHP 5.3.
Using "" for no separator, in both 5.3 and 5.4, before and
after this change, causes no separator to be used, so
there is no functionality loss.
2012-05-23 11:37:27 +02:00
Stanislav Malyshev
6e51989501
fd fix
2012-05-16 16:35:16 +02:00
Stanislav Malyshev
6a0212ea88
Merge branch 'PHP-5.4'
...
* PHP-5.4:
fd fix
fix bug #61065
Conflicts:
UPGRADING
2012-05-15 22:39:17 -07:00
Stanislav Malyshev
df2a38e7f8
fd fix
2012-05-15 22:35:43 -07:00
Nikita Popov
9b101ac8b3
Add T_YIELD "yield" keyword
2012-05-15 18:30:48 +02:00
zoe slattery
129c830562
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Changes to remaining two tests, #62022
2012-05-15 14:40:49 +01:00
zoe slattery
63401268db
Changes to remaining two tests, #62022
2012-05-15 14:39:51 +01:00
zoe slattery
3556efc8e2
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Small fixes to tests, see #62022
2012-05-15 11:48:21 +01:00
zoe slattery
d99203d44b
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Small fixes to tests, see #62022
2012-05-15 11:43:28 +01:00
zoe slattery
e35f09d774
Small fixes to tests, see #62022
2012-05-15 11:42:14 +01:00
Rasmus Lerdorf
8da61c62d9
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix grammo
2012-05-13 11:48:25 -07:00
Rasmus Lerdorf
cd16174f14
Fix grammo
2012-05-13 11:45:41 -07:00
Nuno Lopes
8b4b70df56
fix stack overflow in php_intlog10abs()
...
bug uncovered by LLVM/clang's new -fbounds-checking switch
this patch fixes a crash in ext/standard/tests/math/round_large_exp.phpt
2012-05-11 13:07:21 -04:00
Nuno Lopes
950d5ee590
fix stack overflow in php_intlog10abs()
...
bug uncovered by LLVM/clang's new -fbounds-checking switch
this patch fixes a crash in ext/standard/tests/math/round_large_exp.phpt
2012-05-11 13:07:00 -04:00
Nuno Lopes
5c87ca2d27
fix stack overflow in php_intlog10abs()
...
bug uncovered by LLVM/clang's new -fbounds-checking switch
this patch fixes a crash in ext/standard/tests/math/round_large_exp.phpt
2012-05-11 12:50:29 -04:00
Anatoliy Belsky
d0d7340d50
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix bug #61992 ext\standard\tests\general_functions\bug44295.phpt fails
2012-05-10 17:35:09 +02:00
Anatoliy Belsky
b43d6c8522
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61992 ext\standard\tests\general_functions\bug44295.phpt fails
2012-05-10 17:32:21 +02:00
Anatoliy Belsky
266578f584
Fix bug #61992 ext\standard\tests\general_functions\bug44295.phpt fails
...
Exception text differ on windows
2012-05-10 17:07:38 +02:00
Anatoliy Belsky
f6558a295d
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix bug ext\standard\tests\file\realpath_cache_win32.phpt fails
2012-05-10 15:40:17 +02:00
Anatoliy Belsky
10d5f2301a
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug ext\standard\tests\file\realpath_cache_win32.phpt fails
2012-05-10 15:36:47 +02:00
Anatoliy Belsky
f7d8b274c7
Fix bug ext\standard\tests\file\realpath_cache_win32.phpt fails
...
What happens here is trivial long overflow. Despite the bug attracted
attention on windows, the same story is on linux. Just wait for a big
anough bucket->key . The linux test had %i to check the key value
which should be %d all the way.
2012-05-10 15:27:44 +02:00
Anatoliy Belsky
5fce7fe885
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/*
2012-05-08 19:36:15 +02:00
Anatoliy Belsky
87fa84abde
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/*
2012-05-08 19:35:13 +02:00
Matt Ficken
c12fdbde5f
Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/*
...
Fixed that again for systems having their %SYSTEMROOT% not in
c:\windows
2012-05-08 19:31:41 +02:00
Anatoliy Belsky
d776a933eb
Fix bug 61713 check also that mbstring's found any internal_encoding
2012-05-08 18:31:11 +02:00
Anatoliy Belsky
3a4a25358f
Fix bug #61713 ext\standard\tests\strings\htmlentities10.phpt fails
...
There is a logic error in charset detection part for htmlentities.
When mbstring is compiled shared and mbstring.internal_encoding
is set to pass, it prevents default_charset from being checked
resulting iso-8859-1 being choosed.
2012-05-08 17:42:01 +02:00
Xinchen Hui
5ad35d6c77
Merge branch 'PHP-5.4'
2012-05-06 20:32:33 +08:00
Xinchen Hui
376635cde8
Merge branch 'PHP-5.3' into PHP-5.4
2012-05-06 20:32:15 +08:00
Xinchen Hui
99076bc24f
Change the test folder
2012-05-06 20:31:40 +08:00
Xinchen Hui
556666cc4b
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #61730 (Segfault from array_walk modifying an array passed by reference)
2012-05-06 20:29:26 +08:00
Xinchen Hui
4cceeb25b7
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #61730 (Segfault from array_walk modifying an array passed by reference)
2012-05-06 20:28:18 +08:00
Xinchen Hui
7ccd594392
Fixed bug #61730 (Segfault from array_walk modifying an array passed by reference)
2012-05-06 20:01:10 +08:00
Nikita Popov
9e1b690e0c
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Add NEWS entry for bug #61961
Fixed Bug #61961 (file_get_content leaks when access empty file with max length)
2012-05-06 13:40:06 +02:00
Nikita Popov
bef6111609
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Add NEWS entry for bug #61961
Fixed Bug #61961 (file_get_content leaks when access empty file with max length)
2012-05-06 13:33:47 +02:00
Reeze Xia
3e9923dd8d
Fixed Bug #61961 (file_get_content leaks when access empty file with max length)
2012-05-06 18:27:26 +08:00
Christopher Jones
f2e81779a7
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix masking in bug61115-1.phpt
Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
2012-05-01 14:47:18 -07:00
Christopher Jones
cac09f3333
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix masking in bug61115-1.phpt
2012-05-01 14:34:54 -07:00
Christopher Jones
c864b1ca2f
Fix masking in bug61115-1.phpt
...
The test bug61115-1.phpt was diffing for non-debug builds
2012-05-01 14:32:09 -07:00
Anatoliy Belsky
7fa7d9a8c6
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Additional fixs for bug 61746 - prepare/clean acls
2012-04-30 14:37:08 +02:00
Anatoliy Belsky
fc24e74260
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Additional fixs for bug 61746 - prepare/clean acls
2012-04-30 14:36:42 +02:00
Anatoliy Belsky
ec5421d044
Additional fixs for bug 61746 - prepare/clean acls
2012-04-30 14:33:48 +02:00
Xinchen Hui
a601605f14
merge test from PHP-5.4
2012-04-30 12:33:55 +08:00
Xinchen Hui
d80a3d9668
Revert "Merge branch 'fix-pro_nice-test' of https://github.com/reeze/php-src into PHP-5.3"
...
After pushed, I found the test script in 5.4 is already fixed this, so
revert this change, and be consistent with 5.4's test
This reverts commit 24d85e4bd8
, reversing
changes made to bae56a87f8
.
2012-04-30 12:31:33 +08:00
Xinchen Hui
24d85e4bd8
Merge branch 'fix-pro_nice-test' of https://github.com/reeze/php-src into PHP-5.3
2012-04-30 12:29:15 +08:00
Felipe Pena
7fa45a9399
Merge branch 'PHP-5.4'
...
* PHP-5.4:
- Added missing bound check in iptcparse() (path by chris at chiappa.net)
2012-04-29 19:14:20 -03:00
Felipe Pena
6008f9af8f
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Added missing bound check in iptcparse() (path by chris at chiappa.net)
2012-04-29 19:14:03 -03:00
Felipe Pena
d44a383986
- Added missing bound check in iptcparse() (path by chris at chiappa.net)
2012-04-29 19:12:12 -03:00
reeze
e52be10b30
Fix test for proc_nice: bsd ps command didn't support option -o "%p %n"
2012-04-30 00:59:54 +08:00
Gustavo André dos Santos Lopes
ffec614412
Fix build on MS Windows
2012-04-28 16:32:44 +01:00
Anatoliy Belsky
e857110116
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix bug #61800 ext\standard\tests\streams\bug61371.phpt fails
2012-04-26 13:30:25 +02:00
Anatoliy Belsky
19df3c1b1c
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61800 ext\standard\tests\streams\bug61371.phpt fails
2012-04-26 13:28:49 +02:00
Anatoliy Belsky
4e9db5ba9f
Fix bug #61800 ext\standard\tests\streams\bug61371.phpt fails
2012-04-26 13:27:01 +02:00
Anatoliy Belsky
71f620d436
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Partial fix for bug 61743 to get correct icacls path
sync version
Conflicts:
configure.in
2012-04-25 18:53:56 +02:00
Anatoliy Belsky
459e758f03
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Partial fix for bug 61743 to get correct icacls path
2012-04-25 18:46:22 +02:00
Anatoliy Belsky
433290e199
Partial fix for bug 61743 to get correct icacls path
2012-04-25 18:38:27 +02:00
Gustavo André dos Santos Lopes
d77cde46e1
Merge branch '5.4'
2012-04-23 22:10:50 +01:00
Gustavo André dos Santos Lopes
485638a09c
Merge branch '5.3' into 5.4
2012-04-23 22:10:23 +01:00
Gustavo André dos Santos Lopes
8d748e5de5
Fixed bug #61764 : 'I' unpacks n as signed if n > 2^31-1 on LP64
...
Also fixed possible invalid read on big endian LP64.
2012-04-23 22:09:38 +01:00
Xinchen Hui
5ffe5d471f
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix test
- BFN
2012-04-21 16:03:53 +08:00
Xinchen Hui
9a22bc2662
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix test
- BFN
2012-04-21 16:03:18 +08:00
Xinchen Hui
2e9eb5e32f
Fix test
...
Reported by cjones
2012-04-21 16:02:25 +08:00