php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-26 01:02:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
91,846 Commits 547 Branches 1,481 Tags
3b004baaaa0649bbafa59eadf249d0682beea39e
Commit Graph

91846 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
marcosptf
3b004baaaa new test for enchant pwl file 2015-08-17 21:28:37 +02:00
Jakub Zelenka
f3abea9f91 Fix some int overflows in openssl 
There might be more. I just did a quick check for enc/dec, rand
and one BN call.
 2015-08-16 15:43:00 +01:00
Anatol Belski
1613359543 update NEWS 2015-08-15 17:29:58 +02:00
Anatol Belski
46101dbec5 fix incompatible types 
namely between hash_data_type and st_data_t
 2015-08-15 12:03:47 +02:00
Anatol Belski
3689b44453 add SIZEOF_SIZE_T to oniguruma 2015-08-15 11:39:06 +02:00
Anatol Belski
228eaf5bc4 fix pointer truncation cases 2015-08-15 11:27:07 +02:00
Tjerk Meesters
0bd7d7a369 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Updated NEWS for #70157
  Fixed #70157 parse_ini_string() segmentation fault with INI_SCANNER_TYPED
 2015-08-15 16:49:30 +08:00
Tjerk Meesters
b0c5439b5f Updated NEWS for #70157 2015-08-15 15:13:01 +08:00
Tjerk Meesters
71daca28d4 Merge branch 'bug70157' into PHP-5.6 
* bug70157:
  Fixed #70157 parse_ini_string() segmentation fault with INI_SCANNER_TYPED
 2015-08-15 15:11:31 +08:00
Tjerk Meesters
0d7159d26d Fixed #70157 parse_ini_string() segmentation fault with INI_SCANNER_TYPED 2015-08-15 15:10:34 +08:00
Christoph M. Becker
c63b505573 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fixed wrong params in proto
 2015-08-15 02:27:09 +02:00
Christoph M. Becker
a4e0539188 fixed wrong params in proto 2015-08-15 02:23:56 +02:00
Christoph M. Becker
243b9f6592 Merge branch 'master' of https://git.php.net/repository/php-src 
# By Nikita Popov
# Via Nikita Popov
* 'master' of https://git.php.net/repository/php-src:
  Executed file can be NULL
 2015-08-14 17:21:09 +02:00
Christoph M. Becker
e13de24101 updated NEWS 2015-08-14 17:19:29 +02:00
Christoph M. Becker
fc444896af Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix #70264: CLI server directory traversal
 2015-08-14 17:18:35 +02:00
Nikita Popov
6366679906 Executed file can be NULL 
So revert this part to what it was originally.
 2015-08-14 17:16:45 +02:00
Christoph M. Becker
23d0b93893 updated NEWS 2015-08-14 17:11:33 +02:00
Christoph M. Becker
9c805a6cb3 Fix #70264: CLI server directory traversal 
On Windows the built-in webserver doesn't prevent directory traversal when
backslashes are used as path component separators. Even though that is not a
security issue (the CLI webserver is meant for testing only), we fix that by
replacing backslashes in the path with slashes on Windows, because backslashes
may be valid characters for file names on other systems, but not on Windows.
 2015-08-14 17:05:31 +02:00
Nikita Popov
2af19fb50a Fix leak in previous commit 
Turns out zend_update_property_str already does the copy implicitly.
 2015-08-14 17:04:33 +02:00
Nikita Popov
13567d5dee Don't copy zend_strings during exception creation 
Minor optimization...
 2015-08-14 16:16:27 +02:00
Anatol Belski
38c19d43c1 fix array size calculation for range, related to bug #70239 2015-08-14 14:34:48 +02:00
Anatol Belski
86984d7ade add range() tests 2015-08-14 14:34:48 +02:00
Anatol Belski
01ee09f3f7 Fixed bug #70239 Creating a huge array doesn't result in exhausted, but segfault 2015-08-14 14:34:47 +02:00
Christoph M. Becker
ad27aded5c updated NEWS 2015-08-14 14:32:56 +02:00
Christoph M. Becker
5e93fe3c57 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix #70266 (DateInterval::__construct.interval_spec is not supposed to be optional)
 2015-08-14 14:25:19 +02:00
Christoph M. Becker
0e51f9798c updated NEWS 2015-08-14 14:20:37 +02:00
Christoph M. Becker
e66bf11638 Fix #70266 (DateInterval::__construct.interval_spec is not supposed to be optional) 
The required_num_args argument of ZEND_BEGIN_ARG_INFO_EX() has to be 1.
 2015-08-14 14:19:12 +02:00
Xinchen Hui
a094f4faed Remove useless insert 2015-08-14 17:09:27 +08:00
Xinchen Hui
97433d8f6e Fixed dumpbt 2015-08-14 16:20:53 +08:00
Dmitry Stogov
57a8620761 Set expectations 2015-08-14 10:59:39 +03:00
Adam Harvey
d6db83816c We don't need CVS/SVN keywords in UPGRADING. 2015-08-13 12:40:46 -07:00
Adam Harvey
edafed6b68 We did eventually decide it was PHP 7.0, so make it so. 2015-08-13 12:39:41 -07:00
Christoph M. Becker
f9744a36a2 Merge branch 'pull-request/1454' 
* pull-request/1454:
  Docs for find_tested.php
 2015-08-13 20:33:59 +02:00
Xinchen Hui
66866fb838 Simplify the macro (HT_DATA_SIZE/HT_HASH_SIZE is not used outside Zend) 2015-08-13 23:38:39 +08:00
Xinchen Hui
cf12da4f33 Fixed similar issues(segfault on OOM) 2015-08-13 23:02:51 +08:00
Xinchen Hui
ded3a44cfd Fixed segfault while OOM in pack_to_hash 2015-08-13 22:42:18 +08:00
Xinchen Hui
69dbfa8e9f Fixed tests(I am not sure, these tests seems strange, anyway it passes 
locally now)
 2015-08-13 22:31:59 +08:00
Christoph M. Becker
896cb51499 updated NEWS 2015-08-13 14:30:05 +02:00
Christoph M. Becker
1ec40e84d4 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix #70232: Incorrect bump-along behavior with \K and empty string match

Resolved conflicts:
	ext/pcre/php_pcre.c
 2015-08-13 14:28:16 +02:00
Christoph M. Becker
cd18ba117c updated NEWS 2015-08-13 14:21:17 +02:00
Christoph M. Becker
b9f23c2152 Fix #70232: Incorrect bump-along behavior with \K and empty string match 
To do global matching (/g), for every empty match we have to do a second match
with PCRE_NOTEMPTY turned on. That may fail, however, when the \K escape
sequence is involved. For this purpose libpcre 8.0 introduced the
PCRE_NOTEMPTY_ATSTART flag, which we will use if available, and otherwise fall
back to the old (possibly buggy) behavior.
 2015-08-13 14:20:04 +02:00
Dmitry Stogov
715d5d2855 Get rid of implicit type casting in GC_*() macros in Zend/zend_types.h. 
This prevented compilation warnings and disclosed few incorrect usages in Zend/zend_vm_def.h and ext/dom/xpath.c.
Now explicit type casting may be required on call site.
This may break some C extension code, but it shoulfn't be a problem to add explicit casting.
 2015-08-13 13:56:29 +03:00
Derick Rethans
e5813fedf8 Merge branch 'PHP-5.6' 2015-08-13 11:07:39 +01:00
Derick Rethans
f94bcb1026 Of course, we support v2 in PHP 5.6 as well. 2015-08-13 11:07:16 +01:00
Derick Rethans
159bc6ecdc Updated to version 2015.6 (2015f) 2015-08-13 10:54:06 +01:00
Derick Rethans
a49ddcff67 Empty merge 2015-08-13 10:54:05 +01:00
Derick Rethans
890204fa45 Updated to version 2015.6 (2015f) 2015-08-13 10:54:03 +01:00
Derick Rethans
3ddd826684 Tell timelib we support v2 2015-08-13 10:50:28 +01:00
Xinchen Hui
18f2505830 Add entry for zend_memnstr change 2015-08-13 13:39:31 +08:00
Xinchen Hui
793d8dcffd Merge branch 'master' of git.php.net:php-src 2015-08-13 13:30:50 +08:00