summaryrefslogtreecommitdiff
path: root/win32/php_stdint.h
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-08-04 10:04:02 +0200
committerAnatol Belski <ab@php.net>2014-08-04 10:04:02 +0200
commit38a4b934cac843146843e226470c2ed37033a985 (patch)
tree9b8cd60f8c0351ea2c369b8e2a5a6bdb2595b902 /win32/php_stdint.h
parentdccbb794451c506e0ec645347096c27ac8fefc63 (diff)
parentd730675be5395899906fad74a7d06c8d75e7d9c9 (diff)
downloadphp-git-38a4b934cac843146843e226470c2ed37033a985.tar.gz
Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backportstr_size_and_int64_56_backport
* origin/PHP-5.6: backport the fix for bug #67739 Fix bug #67705 (extensive backtracking in rule regular expression) add test Fix bug #67705 (extensive backtracking in rule regular expression)
Diffstat (limited to 'win32/php_stdint.h')
0 files changed, 0 insertions, 0 deletions