George Wang
af1ac753fe
Clear secret after use.
2015-12-09 11:37:42 +01:00
George Wang
42789e2b8a
Fixed __DIR__ in CLI mode.
2015-12-09 11:37:40 +01:00
Dmitry Stogov
78fb8118ec
Merge branch 'PHP-7.0'
...
* PHP-7.0:
More verbose error messages
2015-12-09 13:35:31 +03:00
Dmitry Stogov
4b16082e94
More verbose error messages
2015-12-09 13:34:45 +03:00
Dmitry Stogov
d6f3d4b50c
Fixed formating
2015-12-09 13:27:31 +03:00
Michael Orlitzky
38b68fc042
ext/dba/config.m4: Autodetect Berkeley DB v5.3.
...
When the user passes --with-db4=DIR to ./configure, the directory DIR
is searched for a number of paths in order of preference. These paths
contain possible locations for Berkeley DB (BDB) to be installed, and
since PHP only supports BDB-4.x and BDB-5.x, it's important that (for
example) version 5.1 be autodetected before falling back to
/usr/include/db.h which can point to BDB-6.x.
The newer BDB-5.3 works with PHP, and if only BDB-5.3 is installed on
the user's system, the current ./configure script is fine. However, if
both BDB-5.3 and BDB-6.0 are installed, version 5.3 is not
autodetected, causing BDB-6.0 to be used. The ./configure step then fails.
This commit adds autodetection for BDB-5.3, and fixes a bug reported
on Gentoo at https://bugs.gentoo.org/show_bug.cgi?id=564824 .
2015-12-09 11:20:36 +01:00
Anatol Belski
56e7903131
fix path separator in test
2015-12-09 11:18:25 +01:00
Anatol Belski
1bd0847f16
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fix bug #70781 (Extension tests fail on dynamic ext dependency)
2015-12-09 11:09:55 +01:00
Francois Laupretre
25abf2f028
Fix bug #70781 (Extension tests fail on dynamic ext dependency)
2015-12-09 11:05:34 +01:00
Dmitry Stogov
44c5fbbc07
Fixed other issues with empty block handling
2015-12-09 10:58:42 +03:00
George Wang
00ed55005a
Bumped SAPI version to 6.9
2015-12-09 00:28:08 -05:00
George Wang
0d84097d44
Added "mod_auth_basic" to apache module list.
2015-12-09 00:27:55 -05:00
George Wang
08080c18f5
Add sanitizing checks for request data.
2015-12-09 00:26:41 -05:00
George Wang
c60d4b9770
Clear secret after use.
2015-12-09 00:26:24 -05:00
George Wang
84fd8ffa2a
Fixed __DIR__ in CLI mode.
2015-12-09 00:25:48 -05:00
George Wang
13096a8120
Bumped SAPI version to 6.9
2015-12-09 00:19:18 -05:00
George Wang
9190684a76
Added "mod_auth_basic" to apache module list.
2015-12-09 00:16:16 -05:00
George Wang
59b414e128
Merge branch 'master' of git.php.net:php-src
2015-12-09 00:11:07 -05:00
George Wang
194cd13c2b
Fixed __DIR__ in CLI mode.
2015-12-09 00:09:14 -05:00
George Wang
372a839040
Add sanitizing checks for request data.
2015-12-09 00:06:49 -05:00
George Wang
292aa9d6cb
Clear secret after use.
2015-12-08 23:43:29 -05:00
Xinchen Hui
245a8c3cdf
end is unsigned, this was broken if start == end == 0
2015-12-09 12:18:25 +08:00
Xinchen Hui
8d7918b8bf
Merge branch 'PHP-7.0'
2015-12-09 12:01:09 +08:00
Xinchen Hui
f248309b74
Revert "Fixed bug #71053 (Type Hint about DateTime::diff does not match with informed)"
...
THis is bc break, which will break $date1->diff($date2 , 1), which is
common used
please do not do bc break without a asking
This reverts commit 943b23dcf6
2015-12-09 12:00:23 +08:00
Reeze Xia
adf40a220b
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fixed bug #71053 (Type Hint about DateTime::diff does not match with informed)
2015-12-09 11:44:05 +08:00
Reeze Xia
943b23dcf6
Fixed bug #71053 (Type Hint about DateTime::diff does not match with informed)
2015-12-09 11:40:47 +08:00
Xinchen Hui
8b69b41a6e
Merge branch 'PHP-7.0'
2015-12-09 11:38:03 +08:00
Xinchen Hui
0adbf6de77
Remove useless check
2015-12-09 11:37:40 +08:00
Dmitry Stogov
433f412731
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
Fixed bug #71066 (mb_send_mail: Program terminated with signal SIGSEGV, Segmentation fault)
move the entry into the correct NEWS block
Update NEWS
Fixed test if PATH is not set
Fixed bug #71063 (filter_input(INPUT_ENV, ..) does not work)
2015-12-09 05:17:22 +03:00
Dmitry Stogov
404e003cf1
Delete empty live-ranges
2015-12-09 05:16:30 +03:00
Dmitry Stogov
5ee7b7d01a
Don't create live-range across NOPs and some other instructions
2015-12-09 05:15:58 +03:00
Xinchen Hui
eea88bb17f
Merge branch 'PHP-7.0'
2015-12-08 17:47:33 -08:00
Xinchen Hui
84b997020e
Fixed bug #71066 (mb_send_mail: Program terminated with signal SIGSEGV, Segmentation fault)
2015-12-08 17:47:16 -08:00
Anatol Belski
d9c344b70d
Merge branch 'PHP-7.0'
...
* PHP-7.0:
move the entry into the correct NEWS block
2015-12-08 18:21:48 +01:00
Anatol Belski
adb9522767
move the entry into the correct NEWS block
2015-12-08 18:20:55 +01:00
Reeze Xia
68027e0581
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Update NEWS
2015-12-09 00:43:10 +08:00
Reeze Xia
10800b8ca2
Update NEWS
2015-12-09 00:41:18 +08:00
Xinchen Hui
227a7a9e26
Merge branch 'master' of git.php.net:/php-src
2015-12-08 08:27:13 -08:00
Xinchen Hui
cf11abad5b
Merge branch 'PHP-7.0'
2015-12-08 08:26:19 -08:00
Xinchen Hui
c47b49c9b5
Fixed test if PATH is not set
2015-12-08 08:26:04 -08:00
Reeze Xia
2ff2ef37b3
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fixed bug #71063 (filter_input(INPUT_ENV, ..) does not work)
2015-12-09 00:11:56 +08:00
Reeze Xia
3427c122bf
Fixed bug #71063 (filter_input(INPUT_ENV, ..) does not work)
2015-12-09 00:04:12 +08:00
Dmitry Stogov
2cc2396f84
Fixed compilation with enabled internal debuging
2015-12-08 18:12:02 +03:00
Dmitry Stogov
c1803bf652
Avoid construction of empty live-ranges because of OP_DATA instruction
2015-12-08 18:10:07 +03:00
Anatol Belski
964b40dd37
Merge branch 'PHP-7.0'
...
* PHP-7.0:
prepare 7.0.1RC1
2015-12-08 16:07:07 +01:00
Anatol Belski
e26b605c21
prepare 7.0.1RC1
2015-12-08 15:54:44 +01:00
Bob Weinand
8bad1368e4
Merge branch 'PHP-7.0'
2015-12-08 15:23:27 +01:00
Bob Weinand
a11805a4d9
PHP_MD5_CTX is now always used due to fix for #71204
2015-12-08 15:23:14 +01:00
Bob Weinand
d7928aae0a
PHP_MD5_CTX is now always used due to fix for #71204
2015-12-08 15:22:25 +01:00
Anatol Belski
307f745230
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Update random.c
2015-12-08 13:17:21 +01:00
