php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-19 14:01:01 +02:00
Code Issues Packages Projects Releases Wiki Activity
76,703 Commits 547 Branches 1,483 Tags
83dda66aac10e7307f2e2f4e73a769b125a88451
Commit Graph

32972 Commits

Author SHA1 Message Date
Xinchen Hui
97f8c78b09 Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 2015-02-17 21:17:06 +08:00
Stanislav Malyshev
213725057e fix TS build 2015-02-17 07:47:12 +01:00
Stanislav Malyshev
cf7d8eabcc Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Port for for bug #68552
  Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
  - BFN
 2015-02-17 06:53:48 +01:00
Stanislav Malyshev
29a4e710de Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone) 2015-02-17 06:53:27 +01:00
Stanislav Malyshev
bdfe457a2c Port for for bug #68552 2015-02-17 06:53:02 +01:00
Stanislav Malyshev
7b18981830 Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone) 
Conflicts:
	ext/date/php_date.c
 2015-02-17 06:43:51 +01:00
Xinchen Hui
66d3095993 Fixed bug #69038 (switch(SOMECONSTANT) misbehaves) 2015-02-17 11:34:57 +08:00
Felipe Pena
94742054a8 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #67827 (broken detection of system crypt sha256/sha512 support)
  - Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de
  Update NEWS
 2015-02-17 01:08:07 -02:00
Felipe Pena
8f9ab04d93 - Fixed bug #67827 (broken detection of system crypt sha256/sha512 support) 2015-02-17 00:23:47 -02:00
Felipe Pena
35a68c276d - Fix merge 2015-02-16 13:09:40 -02:00
Felipe Pena
e08bef442c - Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de 2015-02-16 13:07:26 -02:00
Xinchen Hui
a620b79040 Fixed bug #69054 (Null dereference in readline_(read|write)_history() without parameters) 2015-02-15 22:54:05 +08:00
Xinchen Hui
7667f8efc6 Fixed bug #68638 (pg_update() fails to store infinite values) 2015-02-14 22:17:01 +08:00
Xinchen Hui
40a94597ae Merge branch 'PHP-5.4' of https://github.com/wfelipew/php-src into PHP-5.5 2015-02-14 22:03:53 +08:00
Yasuo Ohgaki
3ea76a768c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add NULL byte protection to exec, system and passthru
 2015-02-14 05:26:54 +09:00
Yasuo Ohgaki
a8722f5330 Add NULL byte protection to exec, system and passthru 2015-02-14 05:25:04 +09:00
Anatol Belski
5ff77b005b fix condition 2015-02-13 13:39:46 +01:00
Xinchen Hui
3a71fa36a2 Micro opt 2015-02-13 13:09:56 +08:00
Xinchen Hui
371c016986 Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 2015-02-13 12:54:04 +08:00
Xinchen Hui
68ab716f18 Fixed #69015 (php-cgi's getopt does not see $argv) 
No test script is added because of complicated
 2015-02-13 12:53:34 +08:00
William Felipe Welter
0421404b73 Fixed bug #68638 pg_update() fails to store infinite values 
Fix indent
 2015-02-12 23:39:54 -02:00
Anatol Belski
b5aca81de1 backport gd config.w32 to support freetype 2.5 2015-02-12 20:27:48 +01:00
Anatol Belski
bc3e88b9af fix dir separator in test 2015-02-10 16:58:59 +01:00
William Felipe Welter
60d5cdf137 Fixed bug #68638 pg_update() fails to store infinite values 
Check if value is "infinity" with strcasestr() to add quotes
 2015-02-09 20:35:18 -02:00
Daniel Lowrey
1eef4f2a0c Miscellaneous cleanup 2015-02-09 11:42:17 -05:00
Daniel Lowrey
a8cb1d2b85 Merge branch 'PHP-5.5' of github.com:bbroerman30/php-src into PHP-5.5 2015-02-09 11:40:04 -05:00
Bob Weinand
fc444fbc70 Shut up, my lovely compiler; I do not like your warnings 
Conflicts:
	Zend/zend_object_handlers.c
 2015-02-09 11:23:35 +08:00
William Felipe Welter
bb3a81c4b4 Fixed bug #68638 pg_update() fails to store infinite values. 
Add quotes only if "infinity" values are received.
 2015-02-07 01:26:12 -02:00
Anatol Belski
9bf95d8291 fix setting default ODBCVER value in config.w32 2015-02-06 19:59:14 +01:00
Anatol Belski
a41aa46759 Fixed bug #68964 Allowed memory size exhausted with odbc_exec 
This is done in two steps:

- the ODBCVER has to be rased to 0x0300 which corresponds to Sql
  Server 9, otherwise the client will not recognize several SQL
  datatypes

- additionally the config scripts was tweaked so then ODBCVER
  can be overridden, that still allows enabling compatibility
  with lower versions

Bug #67437 might be fixed by this as well.
 2015-02-06 19:00:27 +01:00
Anatol Belski
9ef0c39b2b Removed erroneous condition 
This condition is always false. Furthermore headers_list() is
documented to always return an array.
 2015-02-06 09:41:02 +01:00
Stanislav Malyshev
928fdbea08 fix tests 2015-02-05 21:54:47 -08:00
Stanislav Malyshev
067340bbc8 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update header handling to RFC 7230
 2015-02-05 20:09:13 -08:00
Stanislav Malyshev
f001c63073 Update header handling to RFC 7230 2015-02-05 20:08:12 -08:00
William Felipe Welter
b64f149176 Test case Bug #68638 pg_update() fails to store infinite values 2015-02-05 13:19:52 -02:00
Stanislav Malyshev
ee864f3301 fix test to not hit php.net 2015-02-05 00:11:44 -08:00
Julien Pauli
f51b73c833 Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)" 
This reverts commit 8e19705a93.
 2015-02-04 17:39:16 +01:00
Brad Broerman
dddbe0fc33 Update xp_ssl.c 
Added TSRMLS_CC to php_openssl_sockop_io calls.
 2015-02-04 10:13:36 -05:00
Julien Pauli
c85f12e3ac Revert "json_decode() should generate a syntax error when given ""." 
This reverts commit a7b3abe4e6.
 2015-02-04 12:48:17 +01:00
William Felipe Welter
cb3833a3be Fixed bug #68638 pg_update() fails to store infinite values. 
Regex to check float values changed to accept "infinity" values
and ignore case. Quotes are added to prevent syntax error on
PostgreSQL.
 2015-02-03 22:47:05 -02:00
Yasuo Ohgaki
f8a8ccaba2 Fixed Bug #65199 pg_copy_from() modifies input array variable 2015-02-03 15:26:02 +09:00
Yasuo Ohgaki
b41a6c6f05 Fixed Bug #66623 no EINTR check on flock(LOCK_EX) 2015-02-03 14:02:58 +09:00
Yasuo Ohgaki
853ae39d6e Fixed bug #68063 Empty session IDs do still start sessions 2015-02-03 13:38:49 +09:00
Yasuo Ohgaki
17beba686e Bug #61470 is fixed only in master 2015-02-03 12:26:01 +09:00
Daniel Lowrey
f2f467bd96 Fixed bug #65272: correctly set flock() out param in windows 2015-02-02 10:47:54 -05:00
Adam Harvey
9d8b1170aa Let's not assume bash is always /bin/bash. 2015-02-02 11:31:10 +00:00
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
fb803ff819 Add test for bug #61470. It is already fixed. 2015-02-02 18:39:07 +09: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