Gustavo Lopes
e5029ac40b
The compiler can figure this out
2013-01-14 12:22:42 +01:00
Gustavo Lopes
93d1171c47
Remove unused block
2013-01-14 12:22:42 +01:00
Gustavo Lopes
cddbb98ada
strtr() with 2nd param array - optimization
...
About a 1.25x speedup in my test script by writing the result string
only when a match is found and at the end instead of on each iteration.
2013-01-14 12:22:42 +01:00
Gustavo Lopes
2111ee3df5
Refactoring, bugs & leaks
2013-01-14 12:22:41 +01:00
Gustavo Lopes
ccf15cf2dc
Optimize strtr w/ 2nd arg array
...
Fixes bug #63893 : poor efficiency of strtr() using array with keys of
very different length.
The implementation is basically all new, which carries some risk with
it.
The algorithm is described in "A Fast Algorithm For Multi-Pattern
Searching" (1994) by Sun Wu and Udi Manber.
2013-01-14 12:22:41 +01:00
Xinchen Hui
be07f815f2
Use zend_unmangle_property_name_ex to save strlen
2013-01-14 17:08:21 +08:00
Ben Ramsey
a1876b6846
array_column: Set array_pluck as an alias for array_column
2013-01-11 17:09:34 -06:00
Ben Ramsey
5bc2854b37
array_column: Implement ability to specify an index column
2013-01-11 16:58:31 -06:00
Ben Ramsey
94d5b2519a
Cleaning up a memory leak.
2013-01-11 14:16:20 -06:00
Ben Ramsey
20ab30339d
array_column: Adding test for IS_OBJECT and converting object to string
2013-01-11 14:16:19 -06:00
Ben Ramsey
66a02eb25e
array_column: Using add_next_index_zval() at nikic's recommendation.
2013-01-11 14:16:19 -06:00
Ben Ramsey
5f6b20a44d
array_column: Improved tests
2013-01-11 14:16:19 -06:00
Ben Ramsey
e921d28ae3
array_column: Cleaning up, as recommended in pull request #56 comments
2013-01-11 14:16:19 -06:00
Ben Ramsey
10da6f00b8
Fixing typo in test for array_column()
2013-01-11 14:16:19 -06:00
Ben Ramsey
6a27b890e6
Simplify the code and use zend_hash_next_index_insert()
2013-01-11 14:16:19 -06:00
Ben Ramsey
dc4dfe8ae0
Adding test for columns not present in all rows for array_column().
2013-01-11 14:16:19 -06:00
Ben Ramsey
a811e5b6f7
Adding tests for the negative results of array_column()
2013-01-11 14:16:19 -06:00
Ben Ramsey
9035a1ed24
Implement new array function array_column()
...
array_column() returns the values of the specified column from a
multi-dimensional array.
2013-01-11 14:16:19 -06:00
Remi Collet
b3a934bdb3
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle) See commit c05ee74e7f
2013-01-10 11:18:25 +01:00
Remi Collet
f659ec108f
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle) See commit c05ee74e7f
2013-01-10 11:17:53 +01:00
Remi Collet
dc9f0e70b7
Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle)
...
See commit c05ee74e7f
2013-01-10 11:14:38 +01:00
Xinchen Hui
6deb8361f3
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-09 10:57:47 +08:00
Xinchen Hui
15aaa9c660
Merge branch 'PHP-5.3' into PHP-5.4
2013-01-09 10:54:23 +08:00
Xinchen Hui
c05ee74e7f
Fixed bug #63943 (Bad warning text from strpos() on empty needle)
2013-01-09 10:53:20 +08:00
Pierre Joye
f4142a92b2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- fix the fix for bug #50524
2013-01-07 13:04:29 +01:00
Pierre Joye
a71e91626a
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- fix the fix for bug #50524
2013-01-07 13:04:04 +01:00
Pierre Joye
c0fae054c9
- fix the fix for bug #50524
2013-01-07 13:03:12 +01:00
Anatoliy Belsky
8a481c711a
fix windows build
2013-01-06 18:37:26 +01:00
Martin Jansen
371372714d
Add unit test for mail.log ini setting.
2013-01-06 15:04:27 +01:00
Martin Jansen
4a3bf25e3f
Add a timestamp to the mail log.
...
This patch is loosely based on the one in bug #52126 but instead of
using a UNIX timestamp it uses the date format also being used by
error_log et al.
2013-01-06 15:04:19 +01:00
Lars Strojny
ec2fff80e7
Bug #23955 : allow specifiy max age for setcookie()
2013-01-06 03:22:44 +01:00
Xinchen Hui
a666285bc2
Happy New Year
2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009
Happy New Year
2013-01-01 16:28:54 +08:00
Xinchen Hui
a2045ff332
Happy New Year~
2013-01-01 16:02:16 +08:00
Pierrick Charron
8228597ecc
Fixed bug #63874 (Segfaul if php_strip_whitespace has heredoc)
...
T_END_HEREDOC don't carry a token value anymore since commit 4cf90e06c
Bugfix by Nikita for bug #60097
2012-12-29 23:11:37 -05:00
Pierrick Charron
52e7b0ce2c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix test to work on every libcurl version
- Fixed typo on "SKIPIF" (causing make test to abort on some systems)
2012-12-21 12:25:34 -05:00
Pierrick Charron
59a4514dc0
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix test to work on every libcurl version
- Fixed typo on "SKIPIF" (causing make test to abort on some systems)
Conflicts:
tests/output/bug63377.phpt
2012-12-21 12:24:52 -05:00
Pierrick Charron
63659ce526
Fix test to work on every libcurl version
2012-12-21 12:19:54 -05: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
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
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
David Soria Parra
c733f28bd9
Add myself to QA
2012-11-21 18:42:01 +01: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
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
Anthony Ferrara
9aacdf6e89
Merging in Password Hashing API into master
...
This implements the accepted RFC password_hash https://wiki.php.net/rfc/password_hash
2012-10-16 04:11:37 -04:00
Anthony Ferrara
0bc9ca39ce
Refactor to using a stack based zval instead of dynamic allocation
2012-10-07 05:42:08 -04:00
Anthony Ferrara
37b2207f66
Clean up unreported memory leak by switching to zval_ptr_dtor
2012-10-07 05:12:02 -04:00
Anthony Ferrara
76e83f769f
fix allocation and copy issue
2012-10-06 12:33:48 -04:00
Anthony Ferrara
1751d5fabe
Really fix leaks, add test cases to prove it...
2012-10-06 10:38:41 -04:00
Anthony Ferrara
25b2d364e9
Fix issue with possible memory leak
2012-10-05 15:53:40 -04:00
Anthony Ferrara
4a7d18c79e
Fix some double free issues, and more cleanup work
2012-10-05 15:31:58 -04:00
Gustavo Lopes
f8e26d95f2
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #63240 on stream_get_line()
2012-10-12 20:24:13 +02:00
Gustavo Lopes
76601c4fd1
Fix bug #63240 on stream_get_line()
...
stream_get_line() could contain the delimiter string if that string
had more than one character. The bug manifested itself when a read on
the stream ended with part of the delimiter string and the read after
would start with the rest of the delimiter string; provided that
the data of first read did not complete the max length result of the
call to stream_get_line() with the partial delimiter used in that max
length return. In that case, the delimiter will still appear in
the result, divided in two subsequent return values. That is not a bug.
See <http://www.mail-archive.com/internals@lists.php.net/msg61325.html >
2012-10-12 20:23:43 +02:00
Xinchen Hui
45e938ec34
Remove executable permission on phpt
2012-10-10 10:31:53 +08:00
Xinchen Hui
e081c55fb5
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-10 10:31:31 +08:00
Xinchen Hui
610c7fbe7b
Remove executable permission on phpt
2012-10-10 10:27:49 +08:00
Xinchen Hui
e4a8fa6a15
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-09 13:29:51 +08:00
Xinchen Hui
6284ef112e
Fixed bug #63236 (Executable permission on various source files)
2012-10-09 13:28:31 +08:00
Xinchen Hui
60a280936e
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-02 00:30:49 +08:00
Xinchen Hui
4f860a4412
Avoding superfluous function call
2012-10-02 00:28:38 +08:00
Xinchen Hui
af0c22537a
Add test for #35895
2012-10-02 00:27:35 +08:00
Remi Collet
79db2855f7
Bug #63147 : SKIP_ONLINE_TESTS, for getmxrr
2012-09-30 19:40:52 -07:00
Remi Collet
71c61921f3
Bug #63147 : introduce SKIP_ONLINE_TESTS, for gethostbyname
2012-09-30 19:40:43 -07:00
Remi Collet
189b99aee1
gethostbyname_basic002.phpt is a duplicate to gethostbyname_error004.phpt
2012-09-30 19:40:36 -07:00
Stanislav Malyshev
bf064112b7
fix test and move to proper place
2012-09-30 19:24:42 -07:00
husman
491b1efacb
Bug #63162 - parse_url does not matches password component
2012-09-30 19:20:37 -07:00
Gustavo Lopes
2634f55992
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix bug #63240 on stream_get_line()
2012-10-12 20:24:28 +02:00
Xinchen Hui
4b152e5470
Merge branch 'PHP-5.4'
2012-10-10 10:32:38 +08:00
Xinchen Hui
75a2c0d715
Merge branch 'PHP-5.4'
2012-10-09 13:30:22 +08:00
Xinchen Hui
62fa875f3e
Merge branch 'PHP-5.4'
2012-10-02 00:31:47 +08:00
Stanislav Malyshev
4ba2d546c8
Merge branch 'PHP-5.4'
...
* PHP-5.4:
add news for --offline
add --offline option to run-tests command
Bug #63147 : SKIP_ONLINE_TESTS, for getmxrr
Bug #63147 : introduce SKIP_ONLINE_TESTS, for gethostbyname
gethostbyname_basic002.phpt is a duplicate to gethostbyname_error004.phpt
2012-09-30 19:41:54 -07:00
Stanislav Malyshev
815248d8fb
Merge branch 'PHP-5.4'
...
* PHP-5.4:
add bug #63162
fix test and move to proper place
synergy ftl. Removed duplicate fields.
adding test phpt
Bug #63162 - parse_url does not matches password component
fix news
2012-09-30 19:28:42 -07:00
Xinchen Hui
8a930c93dd
Merge branch 'PHP-5.4'
2012-09-24 19:47:47 +08:00
Xinchen Hui
8cdd6bc1e7
Merge branch 'PHP-5.3' into PHP-5.4
2012-09-24 19:47:28 +08:00
Xinchen Hui
2cbc4053ae
Correct the test summary
2012-09-24 19:46:40 +08:00
Xinchen Hui
518fa8c4cf
Merge branch 'PHP-5.4'
2012-09-24 11:01:24 +08:00
Xinchen Hui
d9ad532050
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
ext/standard/tests/general_functions/bug60723.phpt
2012-09-24 11:00:58 +08:00
Xinchen Hui
923511d364
Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
...
Cherry pick to 5.3
2012-09-24 10:59:06 +08:00
Xinchen Hui
8fcb4f1107
Merge branch 'PHP-5.4'
2012-09-23 23:00:15 +08:00
Xinchen Hui
395d77c540
Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
2012-09-23 22:59:31 +08:00
Lars Strojny
6793e09a4e
Merge branch 'PHP-5.4'
2012-09-18 23:17:31 +02:00
Lars Strojny
ee172ce3cc
Merging PR #116
2012-09-18 23:15:03 +02:00
Anthony Ferrara
8bd79d1807
Refactor slightly to enable cleaner readability
2012-09-17 11:43:47 -04:00
Anthony Ferrara
6fd5ba5c8d
Fix arg info for required params passed to needs_rehash
2012-09-17 11:10:59 -04:00
Anthony Ferrara
44c2624f8c
Fix ucwords error casing
2012-09-17 10:59:51 -04:00
Anthony Ferrara
e034a46bdc
A bunch of naming convention fixes. No functionality changes
2012-09-17 10:52:07 -04:00
Anthony Ferrara
83cfff4593
Switch to using an ENUM for algorithms instead of a constant
2012-09-13 10:32:54 -04:00
Anthony Ferrara
7ec80e1a13
Fix incorrect arg info required param count for password_hash
2012-09-12 12:15:33 -04:00
Anthony Ferrara
3e383dc0d5
Merge remote branch 'upstream/master' into hash_password
...
* upstream/master:
Generators & UPGRADING
Capitalize the warning message
Rearrange the codes, remove empty lines
Provide a specific error message if date.timezone value is invalid.
regenerate patch, and save a strlen
Fix the wrong use of snprintf which is introduced in 1d2f619049
Fixed unintendent clearance of PHP_OUTPUT_ACTIVATED flag
Fix doc bug #63032 (Number of release in documentation).
fixed test for bug #52944 also for darwin
-enable VC11 (vc2012)
- Fixed bug #61767 (Shutdown functions not called in certain error situation) - Fixed bug #60909 (custom error handler throwing Exception + fatal error = no shutdown function)
year++
correct PHP version & year++
Correct PHP version
year++
- fix build, there was no tsrm context there, doing a fetch but this is horribly slow, this fix needs improvement (or simply add a TSRM context in the signature in master
- fix build, declarations must be 1st in a contextgit checkout -f master
Fixed bug #62907 (Double free when use traits)
Fixed bug #62991 (Segfault with generator and closure)
2012-09-12 11:48:45 -04:00
Anthony Ferrara
76f3295cdf
Expose PASSWORD_BCRYPT_DEFAULT_COST constant and update test to use it
2012-09-12 11:47:50 -04:00
Anthony Ferrara
e9a7bde829
Switch test to using strict comparison for crypt fallback
2012-09-12 11:37:56 -04:00
Anthony Ferrara
e8b7f5b35d
Add tests for password_get_info and password_needs_rehash
2012-09-12 11:21:08 -04:00
Xinchen Hui
94582f9398
year++
...
missed the .re files in 5.3
2012-09-05 23:47:51 +08:00
Xinchen Hui
d22f18007f
Merge branch 'PHP-5.4'
2012-09-05 23:44:41 +08:00