clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 23:06:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
88,189 Commits 494 Branches 1,367 Tags 802 MiB
b36581aa75
Commit Graph

37766 Commits

Author SHA1 Message Date
Adam Harvey
a7b3abe4e6 json_decode() should generate a syntax error when given "". 
Fixes bug #68938 (json_decode() decodes empty string without error).
Patch by jeremy at bat-country dot us.
 2015-02-02 11:07:34 +00:00
Yasuo Ohgaki
c7eea5a79b Merge branch 'PHP-5.6' 
* PHP-5.6:
  Add test for bug #61470. It is already fixed.
 2015-02-02 18:41:25 +09:00
Yasuo Ohgaki
675a12bbcf Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add test for bug #61470. It is already fixed.
 2015-02-02 18:39:48 +09:00
Yasuo Ohgaki
fb803ff819 Add test for bug #61470. It is already fixed. 2015-02-02 18:39:07 +09:00
Xinchen Hui
d1559dac04 Ported enchant 2015-02-02 16:33:57 +08:00
Yasuo Ohgaki
f248df9003 Cleanup trans sid code. Behavior is unchanged. 
Fixed possible injections. Escape values usually internal safe values.
 2015-02-02 17:06:16 +09:00
Xinchen Hui
7b41f4a41a Ported ldap 2015-02-02 15:05:20 +08:00
Xinchen Hui
e98caf27ea found type is unnecessary 2015-02-02 14:45:19 +08:00
Xinchen Hui
50ae5b31b4 Ported imap 2015-02-02 14:35:50 +08:00
Xinchen Hui
f1981365f5 Fixed #68966 (php7 make file ext/session/mod_mm.lo failed) 2015-02-02 14:24:41 +08:00
Xinchen Hui
7ec8eb380d Use resource directly 2015-02-02 13:56:20 +08:00
Xinchen Hui
38efb690c0 Ported ftp 2015-02-02 13:53:03 +08:00
Xinchen Hui
942809909e Cleanup resource handling APIs 2015-02-02 13:23:16 +08:00
Xinchen Hui
c9e44dc2df Revert "Revert "Fixed warning "(null)(): supplied resource is not a valid cURL handle resource in Unknown on line 0""" 
This reverts commit e78dd7ade2.
 2015-02-02 10:32:26 +08:00
Stanislav Malyshev
bf55a4e223 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix sizeof size
 2015-02-01 12:42:00 -08:00
Stanislav Malyshev
969e389121 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix sizeof size
 2015-02-01 12:41:33 -08:00
Stanislav Malyshev
0bfcc2829c Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
  - Updated to version 2015.1 (2015a)
 2015-02-01 12:41:10 -08:00
Stanislav Malyshev
f66f5b2ffa Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix sizeof size
 2015-02-01 12:41:00 -08:00
Stanislav Malyshev
7efbd70b03 fix sizeof size 2015-02-01 12:40:38 -08:00
Derick Rethans
437719f7cc - Updated to version 2015.1 (2015a) 2015-02-01 18:31:23 +00:00
Derick Rethans
263fb375bd - Updated to version 2015.1 (2015a) 2015-02-01 18:31:21 +00:00
Derick Rethans
4d28d12f86 - Updated to version 2015.1 (2015a) 2015-02-01 18:31:19 +00:00
Stanislav Malyshev
463611714c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #64938: libxml_disable_entity_loader setting is shared between threads
 2015-02-01 00:09:04 -08:00
Martin Jansen
de31324c22 Fix bug #64938: libxml_disable_entity_loader setting is shared between threads 
The availability of entity loading is stored in a module global which
previously was only initialized in the GINIT constructor. This had the
effect that disabling the entity loader in one request caused
subsequent requests hitting the same Apache child process to  also have
the loader disabled.

With this change the loader is explicitely enabled in the request init
phase.
 2015-02-01 00:08:35 -08:00
Stanislav Malyshev
d893814b58 Merge branch 'pull-request/1019' 
* pull-request/1019:
  Fix typos
  Fix bug #64938: libxml_disable_entity_loader setting is shared between threads
 2015-02-01 00:03:26 -08:00
Stanislav Malyshev
911f0ea417 Merge branch 'pull-request/1012' 
* pull-request/1012:
  Fix uninitalized variables reads. See CWE-457 for more info.
 2015-01-31 23:52:10 -08:00
Stanislav Malyshev
87d8e9208c Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix TSRM

Conflicts:
	ext/standard/dns.c
 2015-01-31 23:35:11 -08:00
Stanislav Malyshev
55d5811f85 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix TSRM
 2015-01-31 23:34:44 -08:00
Stanislav Malyshev
d82424b46f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix TSRM
 2015-01-31 23:34:27 -08:00
Stanislav Malyshev
94d6cb4a78 fix TSRM 2015-01-31 23:34:14 -08:00
Stanislav Malyshev
b64cafdb9e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Added test and possible fix for https://bugs.php.net/bug.php?id=67068
 2015-01-31 23:17:24 -08:00
Danack
dbc0a80b23 Added test and possible fix for https://bugs.php.net/bug.php?id=67068 2015-01-31 23:13:55 -08:00
Stanislav Malyshev
e8e0481755 Merge branch 'pull-request/994' 
* pull-request/994:
  Added test and possible fix for https://bugs.php.net/bug.php?id=67068
 2015-01-31 23:12:00 -08:00
Stanislav Malyshev
d6b1865007 Merge branch 'pull-request/988' 
* pull-request/988:
  remove PHP4 extension structure compat
 2015-01-31 23:11:18 -08:00
Stanislav Malyshev
dd15207dc5 Merge branch 'pull-request/945' 
* pull-request/945:
  Update zend_accelerator_hash.c
  hashmap sizes
  Wasted Shared Memory aboce 2Gb fix
 2015-01-31 23:10:37 -08:00
Stanislav Malyshev
c408c80886 Merge branch 'pull-request/989' 
* pull-request/989:
  Fix a few tests and remove error/warning for *0
  Fix spaces -> tabs
  Add deprecated notice to invalid DES salts.
 2015-01-31 22:04:39 -08:00
Stanislav Malyshev
141b14454c Merge branch 'PHP-5.6' 
* PHP-5.6:
  Use better constant since MAXHOSTNAMELEN may mean shorter name
  use right sizeof for memset

Conflicts:
	ext/sockets/sockaddr_conv.c
	ext/standard/dns.c
 2015-01-31 21:50:08 -08:00
Stanislav Malyshev
6a960b6d1b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Use better constant since MAXHOSTNAMELEN may mean shorter name
  use right sizeof for memset
 2015-01-31 21:48:40 -08:00
Stanislav Malyshev
af1f867308 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Use better constant since MAXHOSTNAMELEN may mean shorter name
  use right sizeof for memset
 2015-01-31 21:48:14 -08:00
Stanislav Malyshev
b30a6d6018 Use better constant since MAXHOSTNAMELEN may mean shorter name 2015-01-31 21:46:56 -08:00
Stanislav Malyshev
41bdd6e7cc Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add mitigation for CVE-2015-0235 (bug #68925)
  Add mitigation for CVE-2015-0235 (bug #68925)
 2015-01-31 19:12:20 -08:00
Stanislav Malyshev
882a375dba Add mitigation for CVE-2015-0235 (bug #68925) 2015-01-31 19:10:52 -08:00
Stanislav Malyshev
237128603f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add mitigation for CVE-2015-0235 (bug #68925)
 2015-01-31 19:08:37 -08:00
Stanislav Malyshev
0f9c708229 Add mitigation for CVE-2015-0235 (bug #68925) 2015-01-31 19:08:13 -08:00
Stanislav Malyshev
457367e0b6 Add mitigation for CVE-2015-0235 (bug #68925) 2015-01-31 19:04:55 -08:00
Yasuo Ohgaki
d8803d8147 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed typo in comment
 2015-02-01 05:15:27 +09:00
Yasuo Ohgaki
d9a9afa499 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed typo in comment
 2015-02-01 05:14:56 +09:00
Yasuo Ohgaki
c8a12508c7 Fixed typo in comment 2015-02-01 05:14:27 +09:00
Michael Wallner
0d267bdecc Merge branch 'close_cor' of github.com:MegaManSec/php-src 
* 'close_cor' of github.com:MegaManSec/php-src:
  Fix interbase va_start
 2015-01-30 23:05:10 +01:00
Michael Wallner
3c4540dec9 fix warnings 2015-01-30 22:49:44 +01:00
Michael Wallner
7a94243402 fix warnings 2015-01-30 22:19:23 +01:00
Michael Wallner
960d103d63 fix warnings 2015-01-30 21:36:23 +01:00
Michael Wallner
330d158e93 fix warning 2015-01-30 20:11:25 +01:00
Michael Wallner
bd06f8bb5f fix warnings 2015-01-30 20:08:17 +01:00
Michael Wallner
b72b4084a5 fix warnings 2015-01-30 20:04:04 +01:00
Michael Wallner
f6508f9fa2 fix warnings 2015-01-30 19:54:46 +01:00
Michael Wallner
97b5dabeb1 fix warnings 2015-01-30 19:03:59 +01:00
Xinchen Hui
35c5855201 Merge branch 'master' of https://git.php.net/repository/php-src 2015-01-30 22:11:50 +08:00
Xinchen Hui
4f5d010269 Fixed segfault introduced in f869bf3829 2015-01-30 22:11:21 +08:00
Anatol Belski
8d054be62f fix datatype mismatches, improve error checks 2015-01-30 14:36:33 +01:00
Anatol Belski
085907d168 fix datatype mismatches, improved error checks 2015-01-30 13:52:11 +01:00
Anatol Belski
3acdbaeba0 fix datatype mismatch warns, improve error check 2015-01-30 12:14:27 +01:00
Anatol Belski
397615071c make the cleanup function as static, as it's not exported 2015-01-30 11:20:25 +01:00
Anatol Belski
f6330f9912 fix datatype mismatches, add stronger error checks 2015-01-30 11:10:11 +01:00
Anatol Belski
55936775d2 fix datatype mismatches, improve error checks 2015-01-30 11:02:25 +01:00
Anatol Belski
d2f64edf29 remove unused var 2015-01-30 10:31:37 +01:00
Anatol Belski
bc5686f5d2 remove unused variable 2015-01-30 10:30:45 +01:00
Anatol Belski
aa5e34d79e remove unused var 2015-01-30 10:28:57 +01:00
Xinchen Hui
e78dd7ade2 Revert "Fixed warning "(null)(): supplied resource is not a valid cURL handle resource in Unknown on line 0"" 
This reverts commit 348be58f86.
 2015-01-30 17:01:59 +08:00
Xinchen Hui
d28af7394a Merge branch 'master' of https://git.php.net/repository/php-src 2015-01-30 16:50:55 +08:00
Xinchen Hui
348be58f86 Fixed warning "(null)(): supplied resource is not a valid cURL handle resource in Unknown on line 0" 2015-01-30 16:50:13 +08:00
Anatol Belski
6895cf6e69 nmake install missing header 2015-01-30 09:24:18 +01:00
Xinchen Hui
007d5f2921 indent 2015-01-30 13:19:27 +08:00
Xinchen Hui
91ce41dc1e Add more test for bug #68937 2015-01-30 13:17:35 +08:00
Xinchen Hui
73288bbea4 Fixed bug #68937 (Segfault in curl_multi_exec) 2015-01-30 13:12:58 +08:00
Xinchen Hui
2505aea153 Fixed valgrind issue in mb_ereg_replace_variation1.phpt 2015-01-29 19:28:46 +08:00
Yasuo Ohgaki
7f52978c67 Remove excessive macros 2015-01-29 19:48:50 +09:00
Yasuo Ohgaki
07a5dfca5b Merge branch 'PHP-5.6' 
* PHP-5.6:
  Use bash rather than sh
 2015-01-29 15:27:24 +09:00
Yasuo Ohgaki
7b06cc8d22 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Use bash rather than sh
 2015-01-29 15:27:08 +09:00
Yasuo Ohgaki
d463ddd3c7 Use bash rather than sh 2015-01-29 15:21:17 +09:00
Xinchen Hui
d96eb4b0a8 reorder the branches 2015-01-29 12:50:56 +08:00
Xinchen Hui
18c647cce2 Merge branch 'master' of https://git.php.net/repository/php-src 2015-01-29 12:35:44 +08:00
Xinchen Hui
14396a3264 ppid must be IS_STRING 2015-01-29 12:35:18 +08:00
Yasuo Ohgaki
70b2d2eefa Use proper type 2015-01-29 13:31:40 +09:00
Xinchen Hui
4da7e4de29 The argument must be not changed in session_start 2015-01-29 12:26:13 +08:00
Xinchen Hui
a1d9ceac7a Fixed annoying warnings 2015-01-29 11:59:37 +08:00
Brad Broerman
1482ed2d56 reneg and should_close are not yet members of sslsock. Removing... 2015-01-28 22:36:41 -05:00
Yasuo Ohgaki
7a97eaf25d Cleanup session id files after test 2015-01-29 10:31:39 +09:00
Yasuo Ohgaki
f90f6108c8 Merge branch 'master' into master-rfc-session-lock4 
Conflicts:
	UPGRADING
 2015-01-29 09:55:36 +09:00
Yasuo Ohgaki
14d68d3641 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed Bug #68941 mod_files.sh is a bash-script
 2015-01-29 09:31:21 +09:00
Yasuo Ohgaki
5f28622e09 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed Bug #68941 mod_files.sh is a bash-script
 2015-01-29 09:29:11 +09:00
Yasuo Ohgaki
abf9e2ea09 Fixed Bug #68941 mod_files.sh is a bash-script 2015-01-29 09:25:28 +09:00
Nikita Popov
d133e68bab Remove support for hex number from is_numeric_string 2015-01-28 22:54:17 +01:00
Stanislav Malyshev
14d6de97c5 add imap 2015-01-28 10:15:11 -08:00
Xinchen Hui
b7751630d1 Merge branch 'PHP-5.6' 
Conflicts:
	ext/phar/phar_object.c
 2015-01-29 00:02:03 +08:00
Xinchen Hui
659395e3dd Merge branch 'master' of https://git.php.net/repository/php-src 2015-01-29 00:01:24 +08:00
Xinchen Hui
5208113ad1 Merge branch 'PHP-5.5' into PHP-5.6 2015-01-29 00:01:00 +08:00
Xinchen Hui
b2cf3f064b Fixed bug #68901 (use after free) 2015-01-29 00:00:09 +08:00
Anatol Belski
4d16937449 fix unportable dereferencing 2015-01-28 15:15:38 +01:00
Popa Adrian Marius
be29cb15a6 Merge branch 'master' of https://git.php.net/push/php-src 
* 'master' of https://git.php.net/push/php-src:
  Fixed #68868 (Segfault in clean_non_persistent_constants() in SugarCRM 6.5.20)
 2015-01-28 15:39:58 +02:00
Popa Adrian Marius
b9868f23a0 fbird_close if connection_id omitted, the last opened link is assumed , so it was already closed 2015-01-28 15:39:42 +02:00
Xinchen Hui
a0cf025134 Fixed #68868 (Segfault in clean_non_persistent_constants() in SugarCRM 6.5.20) 2015-01-28 17:12:23 +08:00
Yasuo Ohgaki
e71099bc4e Remove legacy code 2015-01-28 16:01:10 +09:00
Yasuo Ohgaki
4d747b1356 Forgot to apply important peace of patch 2015-01-28 14:22:22 +09:00
Brad Broerman
fd4641696c Updated with SSL fixes (backported from trunk) 2015-01-28 00:04:20 -05:00
Dmitry Stogov
638d0cb753 Merge branch 'typed_returns' of github.com:morrisonlevi/php-src into test 
* 'typed_returns' of github.com:morrisonlevi/php-src:
  Implement return types
 2015-01-28 06:56:19 +03:00
Xinchen Hui
f2f98e51e1 Merge branch 'master' of https://git.php.net/repository/php-src 2015-01-28 10:55:25 +08:00
Yasuo Ohgaki
feeaaa4c3f Fixed crash 2015-01-28 08:03:37 +09:00
Stanislav Malyshev
598c935245 update the .re file for PDO 2015-01-27 13:48:24 -08:00
Levi Morrison
c8576c5a46 Implement return types 
RFC is documented here: https://wiki.php.net/rfc/return_types
 2015-01-27 11:49:56 -07:00
Daniel Lowrey
7d663aa90c Merge branch 'windows-ssl-timeout-fix' 2015-01-27 13:23:58 -05:00
Daniel Lowrey
4965fe7fb8 Merge https://github.com/bbroerman30/php-src into windows-ssl-timeout-fix 
Conflicts:
	ext/openssl/xp_ssl.c
 2015-01-27 13:22:47 -05:00
Stanislav Malyshev
0290571ccf bump the API no 2015-01-27 09:22:20 -08:00
Xinchen Hui
1828ec21e2 Fixed some annoying warnings 2015-01-27 23:28:31 +08:00
Xinchen Hui
68f5eb7e71 minor CS fix 2015-01-27 20:35:25 +08:00
Márcio Almada
927ebc9789 add another test to #1022 2015-01-27 07:16:22 -03:00
Márcio Almada
f869bf3829 fix failure with shared zvals in php_str_replace_in_subject 2015-01-27 07:16:22 -03:00
Márcio Almada
1c0dcb268c add failing test for string_replace and array replaces with references 
```
make test TESTS=ext/standard/tests/strings/str_replace_*.phpt
```
 2015-01-27 07:16:22 -03:00
Xinchen Hui
59593ba66c Fixed #68915 (wrong assertion here) 2015-01-27 15:58:32 +08:00
Brad Broerman
8302d658db Quick fix 2015-01-26 21:35:35 -05:00
Brad Broerman
db49dd91bd Fixed windows infinite loop problem. 2015-01-26 20:40:52 -05:00
Stanislav Malyshev
dfe6aea9ca size_t cleanup for PDO 2015-01-26 16:16:02 -08:00
Joshua Rogers
5863855758 Fix interbase va_start 2015-01-27 09:50:16 +11:00
Bob Weinand
5845f2c0c1 Merge branch 'PHP-5.6' 
Conflicts:
	NEWS
	main/streams/filter.c
 2015-01-26 22:53:36 +01:00
Bob Weinand
666cb333f7 Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6 
Conflicts:
	NEWS
 2015-01-26 22:51:37 +01:00
Bob Weinand
b8461eb9ac Fix call after close if multiple filters are attached 2015-01-26 22:47:35 +01:00
Keyur Govande
5f3dbab0fa One more bad merge fix 2015-01-26 21:44:14 +00:00
Keyur Govande
f41d58efa0 Fix bad merge 2015-01-26 21:38:43 +00:00
Keyur Govande
6635466bcc Merge branch 'PHP-5.6' 
* PHP-5.6:
  Add NEWS
  Patch commit d9f85373e3 by moving the float_to_double function to a header file.
  Fix for bugs #68114 (Build fails on OS X due to undefined symbols) and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient has rounding errors).
  Patch commit d9f85373e3 by moving the float_to_double function to a header file.
  Fix for bugs #68114 (Build fails on OS X due to undefined symbols) and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient has rounding errors).

Conflicts:
	ext/mysqli/mysqli_api.c
	ext/mysqlnd/mysql_float_to_double.h
 2015-01-26 21:36:36 +00:00
Keyur Govande
4c6918ec17 Patch commit d9f85373e3 by moving the float_to_double function to 
a header file.
 2015-01-26 21:20:29 +00:00
Keyur Govande
b34f8ef599 Fix for bugs #68114 (Build fails on OS X due to undefined symbols) 
and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient
has rounding errors).

The patch removes support for Decimal floating point numbers and
now defaults to using similar logic as what libmysqlclient does:
convert a 4 byte floating point number into a string, and then the
string into a double. The quirks of MySQL are maintained as seen in
Field_Float::val_str()
 2015-01-26 21:20:29 +00:00
Keyur Govande
1933b556b9 Patch commit d9f85373e3 by moving the float_to_double function to 
a header file.
 2015-01-26 21:19:00 +00:00
Keyur Govande
e51980f4e6 Fix for bugs #68114 (Build fails on OS X due to undefined symbols) 
and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient
has rounding errors).

The patch removes support for Decimal floating point numbers and
now defaults to using similar logic as what libmysqlclient does:
convert a 4 byte floating point number into a string, and then the
string into a double. The quirks of MySQL are maintained as seen in
Field_Float::val_str()
 2015-01-26 21:19:00 +00:00
Nikita Popov
e05993dfa2 Remove dl() on fpm-fcgi 2015-01-26 21:00:23 +01:00
Nikita Popov
cb9c99ebd0 Remove preg_replace /e modifier 2015-01-26 21:00:23 +01:00
Nikita Popov
4d3e4d3bf9 Remove assignment of new by reference 2015-01-26 21:00:22 +01:00
Dmitry Stogov
23b683c0d3 Fixed wrong size 2015-01-26 15:33:10 +03:00
Dmitry Stogov
8aa146b810 Fixed use after free 2015-01-26 12:24:33 +03:00
Yasuo Ohgaki
7b17980875 Update UPGRADING and UPGRADING.INTERNALS 2015-01-26 06:14:40 +09:00
Jakub Zelenka
3159d518d0 Merge branch 'master' into jsond 
Conflicts:
	ext/json/JSON_parser.c
	ext/json/json.c
 2015-01-25 18:43:15 +00:00
Stanislav Malyshev
f1b2adb881 map fixes 2015-01-25 00:04:18 -08:00
Stanislav Malyshev
cb6fb59b59 Fix the fix for #68884 2015-01-24 23:07:50 -08:00
Yasuo Ohgaki
4ba97bb2ea Merge branch 'master' into master-rfc-session-lock4 2015-01-25 15:47:27 +09:00
Yasuo Ohgaki
0c9bfa96b2 Make session_decode return FALSE when it fails. 
Fix a test.
Use proper types.
 2015-01-25 15:26:00 +09:00
Xinchen Hui
a98fd7125a Fixed bug #68897 (Using variable for sort flag in array_multisort cause wrong results) 2015-01-24 22:51:37 +08:00
Márcio Almada
f27e96c2f8 remove unused var, make string.c compilation zero warnings 2015-01-24 00:26:01 -03:00
Dmitry Stogov
e427188755 Fixed memory leak 2015-01-23 21:47:26 +03:00
Anatol Belski
ee8a0b3797 cleanup TSRMLS_* 2015-01-23 18:05:18 +01:00
Anatol Belski
647caea9f7 C89 compat 2015-01-23 15:04:29 +01:00
Xinchen Hui
4369215b8f Merge branch 'fix-strripos-memleak' of https://github.com/reeze/php-src 2015-01-23 17:35:37 +08:00
Reeze Xia
bdfe4d6558 Fix one more leak when wrong $needle type provide of strripos 2015-01-23 17:14:39 +08:00
Reeze Xia
d44b6e58ba Fixed memory leak of strripos() when empty needle or haystack 2015-01-23 16:53:58 +08:00
Daniel Lowrey
459edceea9 Merge branch 'master' of https://github.com/bbroerman30/php-src 
Conflicts:
	ext/openssl/xp_ssl.c
 2015-01-23 01:03:39 -05:00
Martin Jansen
3a39f3ad70 Fix typos 2015-01-22 21:08:28 +01:00
Martin Jansen
c1eb87ab1a Fix bug #64938: libxml_disable_entity_loader setting is shared between threads 
The availability of entity loading is stored in a module global which
previously was only initialized in the GINIT constructor. This had the
effect that disabling the entity loader in one request caused
subsequent requests hitting the same Apache child process to  also have
the loader disabled.

With this change the loader is explicitely enabled in the request init
phase.
 2015-01-22 20:58:15 +01:00
Anatol Belski
699ada706a Fixed bug #68884 Null pointer deference 2015-01-22 15:01:27 +01:00
Anatol Belski
d2a4940bd2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #68731 finfo_buffer doesn't extract the correct mime with some gifs
 2015-01-22 12:28:11 +01:00
Anatol Belski
093a23d1c4 Fixed bug #68731 finfo_buffer doesn't extract the correct mime with some gifs 
The fix for bug #67647 applies here, too.
 2015-01-22 12:26:50 +01:00
Anatol Belski
ccffa2aad1 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #67647 Bundled libmagic 5.17 does not detect quicktime files correctly

Conflicts:
	ext/fileinfo/data_file.c
 2015-01-22 11:56:34 +01:00
Anatol Belski
c9d0894ec5 Fixed bug #67647 Bundled libmagic 5.17 does not detect quicktime files correctly 2015-01-22 11:48:11 +01:00
Anatol Belski
f9d672f7d4 Merge branch 'PHP-5.6' 
* PHP-5.6:
  simplify error handling for dirs as magic
 2015-01-22 10:17:45 +01:00
Anatol Belski
60c2621b2a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  simplify error handling for dirs as magic
 2015-01-22 10:17:14 +01:00
Anatol Belski
43652d386a simplify error handling for dirs as magic 2015-01-22 10:16:13 +01:00
Anatol Belski
b2c39c1d29 Merge branch 'master' of git.php.net:php-src 2015-01-22 10:03:24 +01:00
Anatol Belski
4e3e95dfc0 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  Fixed bug #68827 Double free with disabled ZMM
 2015-01-22 10:02:05 +01:00
Anatol Belski
d0e75bdc59 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #68827 Double free with disabled ZMM
  Fixed segfault while running with moodle
 2015-01-22 10:00:10 +01:00
Joshua Rogers
91aa340180 Fixed bug #68827 Double free with disabled ZMM 2015-01-22 09:59:13 +01:00
Xinchen Hui
fc25720986 Merge branch 'master' of https://git.php.net/repository/php-src 2015-01-22 16:55:53 +08:00
Xinchen Hui
6ae57df70b Revert "Fixed valgrind reported issue with setlocale" 
This reverts commit fa06343d7e.
 2015-01-22 16:55:20 +08:00
Dmitry Stogov
3e31838d19 zend_read_property() has to provide a holder for return value. 
Previously it was possible that zend_read_property() returned pointer to zval allocated on stack.
 2015-01-22 11:50:42 +03:00
Xinchen Hui
201f660ae1 Merge branch 'PHP-5.6' 2015-01-22 16:39:22 +08:00
Xinchen Hui
d0928b7f97 Merge branch 'PHP-5.5' into PHP-5.6 2015-01-22 16:39:03 +08:00
Xinchen Hui
251745c012 Fixed segfault while running with moodle 2015-01-22 16:38:34 +08:00
Popa Adrian Marius
56c5b8e399 Revert "Remove Jouni Ahto from maintainers and files as requested , anyway we have git blame/history" 
This reverts commit 7cf1450df1.
 2015-01-22 10:16:51 +02:00
Yasuo Ohgaki
e6c8640a2a WIP - test passes 2015-01-22 13:34:58 +09:00
Popa Adrian Marius
7cf1450df1 Remove Jouni Ahto from maintainers and files as requested , anyway we have git blame/history 2015-01-21 18:08:56 +02:00
Anatol Belski
1463115e7e Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix timelib build configuration

Conflicts:
	ext/date/config.w32
	ext/date/config0.m4
	win32/build/config.w32
	win32/build/config.w32.phpize.in
 2015-01-21 16:26:36 +01:00
Anatol Belski
24157f396c fix timelib build configuration 2015-01-21 16:22:23 +01:00
Brad Broerman
ebb67cd6fe Renamed timeval functions to comply with PHP naming standards 2015-01-21 10:20:32 -05:00
Anatol Belski
35bfa022f9 Merge branch 'PHP-5.6' 
* PHP-5.6:
  make timelib_config.h inclusion configurable

Conflicts:
	win32/build/config.w32
	win32/build/config.w32.phpize.in
 2015-01-21 13:55:07 +01:00
Anatol Belski
bd52f4a833 make timelib_config.h inclusion configurable 2015-01-21 13:48:38 +01:00
Anatol Belski
9c88a214a4 backported the timelib cleanups to 5.6 2015-01-21 11:03:16 +01:00
Anatol Belski
8faadc22d1 make timelib use PHP's defines when it's inside PHP only 
otherwise system defines will be used
 2015-01-21 10:49:28 +01:00
Anatol Belski
2f8d40ca79 decouple timelib from php_stdint.h 2015-01-21 09:42:54 +01:00
Rasmus Lerdorf
41013ba597 Fix the most obvious issues here. 
There are other problems though
 2015-01-20 23:56:51 -08:00
Rasmus Lerdorf
f9664ce853 PHP7 API updates 2015-01-20 23:40:33 -08:00
Rasmus Lerdorf
a25054b907 int -> size_t and long -> zend_long 2015-01-20 23:11:22 -08:00
Rasmus Lerdorf
03ba4ba37e int -> size_t 
and fix the variable name
 2015-01-20 23:00:40 -08:00
Rasmus Lerdorf
030b4b29db int -> size_t 2015-01-20 22:58:31 -08:00
Rasmus Lerdorf
c5e56f7868 int -> size_t 2015-01-20 22:53:11 -08:00
Rasmus Lerdorf
bcaa06de3a int -> size_t 2015-01-20 22:51:09 -08:00
Rasmus Lerdorf
ec1278ccb2 int -> size_t 2015-01-20 22:50:17 -08:00
Rasmus Lerdorf
57f456a39b int -> size_t 2015-01-20 22:45:07 -08:00
Rasmus Lerdorf
c2465211af Missed removing a couple of _len vars 2015-01-20 22:41:18 -08:00
Xinchen Hui
fa06343d7e Fixed valgrind reported issue with setlocale 2015-01-21 12:03:19 +08:00
Xinchen Hui
88e88426df Merge branch 'PHP-5.6' 2015-01-21 11:18:27 +08:00
Xinchen Hui
57ff5a4e6f Merge branch 'PHP-5.5' into PHP-5.6 2015-01-21 11:18:08 +08:00
Xinchen Hui
20e5911d82 Fixed test fails 2015-01-21 11:17:49 +08:00
Rasmus Lerdorf
dc61ac998d Finishing porting ext/imap to PHP7 
All tests pass now
 2015-01-20 15:43:08 -08:00
Derick Rethans
a3a529411e Merge branch 'PHP-5.6' 2015-01-20 21:44:36 +00:00
Derick Rethans
1d09926e33 Merge branch 'PHP-5.5' into PHP-5.6 2015-01-20 21:44:25 +00:00
Derick Rethans
8e19705a93 Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat) 2015-01-20 21:44:19 +00:00
Anatol Belski
44cbba100a fix leaking of locale_string in TS build 
actually more like an attempt as i see the leaks on travis,
but don't repro on my boxes
 2015-01-20 20:52:44 +01:00
Joshua Rogers
6621840951 Fix uninitalized variables reads. See CWE-457 for more info. 2015-01-21 06:52:19 +11:00
Stanislav Malyshev
b16fdebcf8 Merge branch 'PHP-5.6' 
* PHP-5.6:
  5.4.38 next
  Updated NEWS
  Updated NEWS
  Fix bug #68711 Remove useless checks. 'num' is unsigned and cannot be <0.
  Fix bug #68799: Free called on unitialized pointer
  Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())

Conflicts:
	ext/exif/exif.c
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
 2015-01-20 10:41:59 -08:00
Stanislav Malyshev
e18ec95687 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  5.4.38 next
  Fix bug #68799: Free called on unitialized pointer
  Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())

Conflicts:
	ext/standard/var_unserializer.c
 2015-01-20 10:40:39 -08:00
Stanislav Malyshev
e2744c51b6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  5.4.38 next
  Fix bug #68799: Free called on unitialized pointer
  Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())

Conflicts:
	configure.in
	main/php_version.h
 2015-01-20 10:40:11 -08:00
Anatol Belski
ea8415114a fix premature freeing of BG(locale_string) 
the returned string has to be refcounted
 2015-01-20 16:54:04 +01:00
Joshua Rogers
c9b25859f0 Fix bug #68711 Remove useless checks. 'num' is unsigned and cannot be <0. 2015-01-20 15:11:25 +01:00
Julien Pauli
157508d87d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Updated NEWS
  Fix bug #68711 Remove useless checks. 'num' is unsigned and cannot be <0.
 2015-01-20 15:09:34 +01:00
Xinchen Hui
afa666f650 Optimized range 2015-01-20 22:02:11 +08:00
Joshua Rogers
df67c4e8bd Fix bug #68711 Remove useless checks. 'num' is unsigned and cannot be <0. 2015-01-20 14:54:48 +01:00
Stanislav Malyshev
e63f7b47e1 Merge branch 'bug68710' into PHP-5.4 
* bug68710:
  Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())
 2015-01-20 01:02:26 -08:00
Stanislav Malyshev
fc6aa939f5 Merge branch 'bug68799' into PHP-5.4 
* bug68799:
  Fix bug #68799: Free called on unitialized pointer
 2015-01-20 01:00:11 -08:00
Xinchen Hui
47b7d90703 NUM_KEY is useless here 2015-01-20 16:51:20 +08:00
Andrea Faulds
5c88d11243 Update remaining octal 32-bit tests 2015-01-20 05:54:13 +00:00
Xinchen Hui
c369a03407 Use zend_string in case we will optimize them 2015-01-20 10:59:28 +08:00
Xinchen Hui
020610ee40 Remove addslashes_str 2015-01-20 10:11:48 +08:00
Derick Rethans
1ee7845f57 Merge branch 'PHP-5.6' 2015-01-19 22:59:41 +00:00
Derick Rethans
6f2f2ce5cf Merge branch 'PHP-5.5' into PHP-5.6 2015-01-19 22:59:31 +00:00
Derick Rethans
b0159431e3 Fixed bug #45081 (strtotime incorrectly interprets SGT time zone). 2015-01-19 22:59:24 +00:00
Stanislav Malyshev
1fdd558e39 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #50224 where float without decimals were converted to integer
  Updated NEWS for #68371
 2015-01-19 10:05:57 -08:00
Xinchen Hui
1b53a99fbf Remove dead codes 2015-01-19 10:46:59 -05:00
Xinchen Hui
da7d8f45b2 Optimized php_addslashes 2015-01-19 10:46:39 -05:00
Dmitry Stogov
22ac15e6c9 Improve optimization of CONCAT/ADD_STRING/ADD_CJAR sequences 2015-01-19 17:01:30 +03:00
Xinchen Hui
d917484ab7 Micro optimization for array_diff 2015-01-19 08:08:35 -05:00
Xinchen Hui
ac9a1a7b0c Optimized trim for what_len == 1 2015-01-19 07:45:30 -05:00
Juan Basso
ac7cfad3b5 Fixed bug #50224 where float without decimals were converted to integer 2015-01-19 00:46:02 -08:00
Xinchen Hui
0bf9326512 Merge branch 'master' of https://git.php.net/repository/php-src 2015-01-19 01:37:13 -05:00
Stanislav Malyshev
02402ae695 fix size & compilation on Darwin 2015-01-18 22:44:35 -08:00
Xinchen Hui
020b51b46e Don't use >= as sorting condition 
which could avoid breaking usage like:

usort($a, function($a, $b) { return $a > $b; })
 2015-01-19 01:36:56 -05:00
Xinchen Hui
0706032b73 Better fix 2015-01-18 21:38:25 -05:00
Andrea Faulds
0be3626ec6 fix build 2015-01-18 19:20:12 +00:00
Jakub Zelenka
3ddb5993dd Increase PHP_JSON_DOUBLE_MAX_LENGTH for fractional part 
This is probably not necessary as such number
is not realistic. It's just to be consistent
with jsond extension.
 2015-01-18 16:31:24 +00:00
Jakub Zelenka
91386cb287 Merge pull request #1 from jrbasso/json_preserve_fractional_part 
Porting implementation of RFC json_preserve_fractional_part
 2015-01-18 16:26:25 +00:00
Xinchen Hui
f3052c5d2f Fixed bug #68852 (broken strrpos with negative offset) 2015-01-18 10:05:27 -05:00
Xinchen Hui
89beb12fef Fixed bug #68809 (Unchecked return value) 2015-01-17 23:04:41 -05:00
Xinchen Hui
ad32e03327 Fixed bug #68814 (Unchecked return value) 2015-01-17 22:58:16 -05:00
Xinchen Hui
b21d9123a5 Fixed #68826 (Resource leak) 2015-01-17 22:56:02 -05:00
Xinchen Hui
4b3ae843fc Fixed #68832 (Unchecked return value) 2015-01-17 22:19:25 -05:00
Joshua Rogers
f418486343 Fixed bug #68848 Missing return 2015-01-17 20:59:04 +01:00
Andrea Faulds
5f29b98051 Error on invalid octal (fixes PHPSadness #31) 
Further error checks
 2015-01-17 18:50:28 +00:00
Nikita Popov
ca11bc0325 Remove set_socket_blocking 2015-01-17 18:26:45 +01:00
Nikita Popov
a60efc5e11 Remove set_magic_quotes_runtime 
And the alias magic_quotes_runtime
 2015-01-17 18:26:45 +01:00
Nikita Popov
4c115b6b71 Remove string category support in setlocale() 2015-01-17 18:26:45 +01:00
Nikita Popov
9c5eaac18b Remove mktime() and gmmktime() $is_dst parameter 2015-01-17 18:26:45 +01:00
Nikita Popov
83391b5518 Remove for #-style comments in ini files 2015-01-17 18:26:44 +01:00
Rasmus Lerdorf
ff6b4ad8c7 FAST ZPP for strtok() and nl2br() 
Looking at some template-driven code that calls these
hundreds of times per request
 2015-01-17 08:30:40 -08:00
Xinchen Hui
f487e4c638 attempt to fix again :< 2015-01-17 15:21:32 +08:00
Xinchen Hui
151411f8bd Fix again 2015-01-17 14:43:05 +08:00