]>
granicus.if.org Git - php/log
Xinchen Hui [Mon, 15 Sep 2014 08:54:36 +0000 (16:54 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Mon, 15 Sep 2014 08:52:33 +0000 (16:52 +0800)]
Remove redundant codes
Anatol Belski [Mon, 15 Sep 2014 08:39:51 +0000 (10:39 +0200)]
fix type
Kalle Sommer Nielsen [Mon, 15 Sep 2014 08:35:39 +0000 (10:35 +0200)]
optimize path length retrieval
Anatol Belski [Mon, 15 Sep 2014 08:29:28 +0000 (10:29 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
updated NEWS
Anatol Belski [Mon, 15 Sep 2014 08:29:00 +0000 (10:29 +0200)]
updated NEWS
Anatol Belski [Mon, 15 Sep 2014 08:28:22 +0000 (10:28 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
Anatol Belski [Mon, 15 Sep 2014 08:27:52 +0000 (10:27 +0200)]
updated NEWS
Xinchen Hui [Mon, 15 Sep 2014 06:50:16 +0000 (14:50 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Mon, 15 Sep 2014 06:49:34 +0000 (14:49 +0800)]
Add test script for the segfault in gc while run phpspec
Remi Collet [Mon, 15 Sep 2014 06:28:22 +0000 (08:28 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix NEWS - #65641 mod_proxy-fcgi is not fixed (still open) - #67606 mod_fastcgi is fixed in
ee275e34c8b303945945c650d4bc90dcc2ac0b17
Fix NEWS - #65641 mod_proxy-fcgi is not fixed (still open) - #67606 mod_fastcgi is fixed in
ee275e34c8b303945945c650d4bc90dcc2ac0b17
Fix bug #111 (compile error without ZEND_SIGNALS)
Don't run travis against master (phpng)
Update README.md
Remi Collet [Mon, 15 Sep 2014 06:24:20 +0000 (08:24 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix NEWS - #65641 mod_proxy-fcgi is not fixed (still open) - #67606 mod_fastcgi is fixed in
ee275e34c8b303945945c650d4bc90dcc2ac0b17
Fix NEWS - #65641 mod_proxy-fcgi is not fixed (still open) - #67606 mod_fastcgi is fixed in
ee275e34c8b303945945c650d4bc90dcc2ac0b17
Remi Collet [Mon, 15 Sep 2014 06:24:10 +0000 (08:24 +0200)]
Fix NEWS
- #65641 mod_proxy-fcgi is not fixed (still open)
- #67606 mod_fastcgi is fixed in
ee275e34c8b303945945c650d4bc90dcc2ac0b17
Remi Collet [Mon, 15 Sep 2014 06:23:40 +0000 (08:23 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix NEWS - #65641 mod_proxy-fcgi is not fixed (still open) - #67606 mod_fastcgi is fixed in
ee275e34c8b303945945c650d4bc90dcc2ac0b17
Remi Collet [Mon, 15 Sep 2014 06:23:25 +0000 (08:23 +0200)]
Fix NEWS
- #65641 mod_proxy-fcgi is not fixed (still open)
- #67606 mod_fastcgi is fixed in
ee275e34c8b303945945c650d4bc90dcc2ac0b17
Bob Weinand [Mon, 15 Sep 2014 03:48:09 +0000 (05:48 +0200)]
Merge phpdbg into PHP-5.6
Anatol Belski [Sun, 14 Sep 2014 22:39:55 +0000 (00:39 +0200)]
avoid strlen usage in the loop
Anatol Belski [Sun, 14 Sep 2014 21:10:41 +0000 (23:10 +0200)]
fix format
Anatol Belski [Sun, 14 Sep 2014 21:03:13 +0000 (23:03 +0200)]
fix ftell/fseek calls
Anatol Belski [Sun, 14 Sep 2014 20:31:01 +0000 (22:31 +0200)]
reduce struct size by 8 byte on 64 bit
Anatol Belski [Sun, 14 Sep 2014 20:28:42 +0000 (22:28 +0200)]
fix ftell/fseek calls
Anatol Belski [Sun, 14 Sep 2014 20:07:38 +0000 (22:07 +0200)]
better way to check for empty string
Anatol Belski [Sun, 14 Sep 2014 19:38:46 +0000 (21:38 +0200)]
make xml_utf8_ encode/decode work with size_t
Anatol Belski [Sun, 14 Sep 2014 15:00:34 +0000 (17:00 +0200)]
avoid repeated strlen usage
Anatol Belski [Sun, 14 Sep 2014 15:00:06 +0000 (17:00 +0200)]
avoid strlen() usage in loop
Anatol Belski [Sun, 14 Sep 2014 14:37:38 +0000 (16:37 +0200)]
fix int overflow preserving the old behavior
Nikita Popov [Sat, 13 Sep 2014 21:30:32 +0000 (23:30 +0200)]
Fix use of stack variable outside its block
Nikita Popov [Sat, 13 Sep 2014 21:14:04 +0000 (23:14 +0200)]
zend_get_property_info takes a zend_string* now
Anatol Belski [Sun, 14 Sep 2014 13:09:54 +0000 (15:09 +0200)]
use nice way to achieve the property name length
Anatol Belski [Sun, 14 Sep 2014 13:03:52 +0000 (15:03 +0200)]
make it safer for an array underrun
Anatol Belski [Sun, 14 Sep 2014 12:43:39 +0000 (14:43 +0200)]
fix type
Anatol Belski [Sun, 14 Sep 2014 10:59:31 +0000 (12:59 +0200)]
avoid repeated strlen() usage
Anatol Belski [Sun, 14 Sep 2014 10:32:38 +0000 (12:32 +0200)]
reduce struct size by 8 bytes on 64 bit
Anatol Belski [Sun, 14 Sep 2014 10:30:01 +0000 (12:30 +0200)]
avoid repeated strlen() usage
Bob Weinand [Sun, 14 Sep 2014 10:24:56 +0000 (12:24 +0200)]
Fix bug #111 (compile error without ZEND_SIGNALS)
Anatol Belski [Sun, 14 Sep 2014 10:18:52 +0000 (12:18 +0200)]
fix possible pointer truncation
Anatol Belski [Sun, 14 Sep 2014 09:48:51 +0000 (11:48 +0200)]
better way to zero away sensitive data
memset could be optimized away by the compiler
Anatol Belski [Sun, 14 Sep 2014 09:36:11 +0000 (11:36 +0200)]
reduce struct size by 8 byte on 64 bit
Anatol Belski [Sun, 14 Sep 2014 09:26:17 +0000 (11:26 +0200)]
reduce struct size by 8 byte on 64 bit
Anatol Belski [Sun, 14 Sep 2014 09:13:17 +0000 (11:13 +0200)]
reduce struct sizes by 8 bytes each on 64 bit
Anatol Belski [Sun, 14 Sep 2014 09:00:22 +0000 (11:00 +0200)]
remove useless casts and checks
Anatol Belski [Sun, 14 Sep 2014 08:27:00 +0000 (10:27 +0200)]
align 4 byte to the start of the word
Anatol Belski [Sun, 14 Sep 2014 08:24:10 +0000 (10:24 +0200)]
fix conditions
substraction from an unsigned
Anatol Belski [Sun, 14 Sep 2014 07:40:56 +0000 (09:40 +0200)]
reduce the struct size by 8 byte on 64 bit
Anatol Belski [Sun, 14 Sep 2014 07:25:09 +0000 (09:25 +0200)]
reduce the struct size by 8 byte on 64 bit
Anatol Belski [Sun, 14 Sep 2014 07:22:02 +0000 (09:22 +0200)]
reduce the struct size by 8 byte on 64 bit
Anatol Belski [Sat, 13 Sep 2014 23:22:55 +0000 (01:22 +0200)]
reduce the struct size by 8 byte on 64 bit
Anatol Belski [Sat, 13 Sep 2014 23:12:12 +0000 (01:12 +0200)]
reduce the struct size by 8 byte on 64 bit
Anatol Belski [Sat, 13 Sep 2014 22:59:46 +0000 (00:59 +0200)]
reduce the struct size by 8 byte on 64 bit
Anatol Belski [Sat, 13 Sep 2014 22:43:58 +0000 (00:43 +0200)]
use the generator to produce the header
Anatol Belski [Sat, 13 Sep 2014 22:42:48 +0000 (00:42 +0200)]
update the html table generator
Anatol Belski [Sat, 13 Sep 2014 22:00:52 +0000 (00:00 +0200)]
removed the emalloc result check, out of memory will bailout
Anatol Belski [Sat, 13 Sep 2014 21:57:53 +0000 (23:57 +0200)]
replaced the check with assert as it's kinda unusual case
Anatol Belski [Sat, 13 Sep 2014 21:55:30 +0000 (23:55 +0200)]
removed extra 1 byte member, padding will be done anyway by the compiler
Anatol Belski [Sat, 13 Sep 2014 21:34:08 +0000 (23:34 +0200)]
reduce struct size by 8 byte on 64 bit
Anatol Belski [Sat, 13 Sep 2014 19:44:40 +0000 (21:44 +0200)]
avoid usage of strlen() in the loop
Anatol Belski [Sat, 13 Sep 2014 19:22:57 +0000 (21:22 +0200)]
reduce struct size by 8 byte on 64 bit
Anatol Belski [Sat, 13 Sep 2014 19:19:22 +0000 (21:19 +0200)]
better align reduce the struct size by 8 byte on 64 bit
Anatol Belski [Sat, 13 Sep 2014 18:47:59 +0000 (20:47 +0200)]
reduce the struct size (under circumstances) on 64 bit
Anatol Belski [Sat, 13 Sep 2014 18:42:46 +0000 (20:42 +0200)]
check if the winver was indeed fetched
Anatol Belski [Sat, 13 Sep 2014 18:20:17 +0000 (20:20 +0200)]
check emalloc() result
Anatol Belski [Sat, 13 Sep 2014 18:12:21 +0000 (20:12 +0200)]
better way to check for an empty string
Anatol Belski [Sat, 13 Sep 2014 18:02:49 +0000 (20:02 +0200)]
reduce the union size from 24 to 16 bytes on 64 bit
Anatol Belski [Sat, 13 Sep 2014 16:20:24 +0000 (18:20 +0200)]
fix condition
comparsion of two unsigned
Anatol Belski [Sat, 13 Sep 2014 16:09:30 +0000 (18:09 +0200)]
avoid multiple strlen() usage
Anatol Belski [Sat, 13 Sep 2014 15:58:47 +0000 (17:58 +0200)]
avoid multiple strlen() calls for the same
Anatol Belski [Sat, 13 Sep 2014 15:47:42 +0000 (17:47 +0200)]
reduced struct sizes by 8 byte each on 64 bit
Anatol Belski [Sat, 13 Sep 2014 15:35:59 +0000 (17:35 +0200)]
fix condition
substraction of two unsigned
Anatol Belski [Sat, 13 Sep 2014 12:26:59 +0000 (14:26 +0200)]
reduce struct sizes by 8 byte on 64 bit
Anatol Belski [Sat, 13 Sep 2014 12:19:39 +0000 (14:19 +0200)]
avoid strlen() usage in the loop
Nikita Popov [Sat, 13 Sep 2014 20:25:58 +0000 (22:25 +0200)]
Drop superfluous opline for non-cv variables
Nikita Popov [Sat, 13 Sep 2014 20:21:35 +0000 (22:21 +0200)]
Drop dead assignments
Nikita Popov [Sat, 13 Sep 2014 20:05:37 +0000 (22:05 +0200)]
Make zend_llist_remove_tail a void function
The returned data is already dtored and freed at this point.
Nikita Popov [Sat, 13 Sep 2014 19:57:58 +0000 (21:57 +0200)]
Use more accurate sizeof
This is allocating an array of zval*s, not zval**s.
Nikita Popov [Thu, 11 Sep 2014 21:21:40 +0000 (23:21 +0200)]
Also skip line-overwriting if SHOW_ONLY_GROUPS is used
Anatol Belski [Sat, 13 Sep 2014 11:52:10 +0000 (13:52 +0200)]
switch to using mbrlen with VS
Anatol Belski [Sat, 13 Sep 2014 10:52:11 +0000 (12:52 +0200)]
reduce the struct size by 8 byte on 64 bit
this one looks like debug only, but still useful
Anatol Belski [Sat, 13 Sep 2014 10:49:10 +0000 (12:49 +0200)]
reduced the struct size by 8 byte on 64 bit
Anatol Belski [Fri, 12 Sep 2014 22:03:42 +0000 (00:03 +0200)]
fix condition
A char array like val[1] would always be valid when checking like
!val. Probably better were to check for ->len, but actually ->val[0]
is fine as the actual zend_string should have been initalized
before.
Anatol Belski [Fri, 12 Sep 2014 21:27:55 +0000 (23:27 +0200)]
reduce the struct size by 8 byte on 64 bit
Anatol Belski [Fri, 12 Sep 2014 21:10:56 +0000 (23:10 +0200)]
reduce the struct size by 8 bytes on 64 bit
Anatol Belski [Fri, 12 Sep 2014 21:08:09 +0000 (23:08 +0200)]
reduce the struct size by 8 byte on x64
Anatol Belski [Fri, 12 Sep 2014 20:31:02 +0000 (22:31 +0200)]
fix possible null ptr deref
Anatol Belski [Fri, 12 Sep 2014 20:18:06 +0000 (22:18 +0200)]
fix possible nullptr derefrence
Anatol Belski [Fri, 12 Sep 2014 20:06:10 +0000 (22:06 +0200)]
reduce size by 8 byte on 64 bit
Anatol Belski [Fri, 12 Sep 2014 19:38:39 +0000 (21:38 +0200)]
fix ZTS build
Anatol Belski [Fri, 12 Sep 2014 19:31:25 +0000 (21:31 +0200)]
better align and reduce size by 8 byte on 64 bit
Anatol Belski [Fri, 12 Sep 2014 15:01:53 +0000 (17:01 +0200)]
fix test which fails if prevous run cleanup failed
Anatol Belski [Fri, 12 Sep 2014 14:43:05 +0000 (16:43 +0200)]
fix type
Anatol Belski [Fri, 12 Sep 2014 14:39:09 +0000 (16:39 +0200)]
fix type
Anatol Belski [Fri, 12 Sep 2014 14:37:55 +0000 (16:37 +0200)]
fix type
Anatol Belski [Fri, 12 Sep 2014 14:23:24 +0000 (16:23 +0200)]
reduce the struct size by 8 byte on 64 bit
Anatol Belski [Fri, 12 Sep 2014 14:22:42 +0000 (16:22 +0200)]
fix type
Anatol Belski [Fri, 12 Sep 2014 13:59:54 +0000 (15:59 +0200)]
better alignment, reduced the struct by 8 byte on 64 bit
Anatol Belski [Fri, 12 Sep 2014 13:51:39 +0000 (15:51 +0200)]
fix type
Xinchen Hui [Fri, 12 Sep 2014 18:00:15 +0000 (02:00 +0800)]
Forget to commit this part...
Xinchen Hui [Fri, 12 Sep 2014 17:52:47 +0000 (01:52 +0800)]
Finally!!! Fixed segfault in GC
this must not be the final fix, but let's stop the segfault first and
use this to indicate where the problem is.
reproduced by phpspec
Anatol Belski [Fri, 12 Sep 2014 12:03:06 +0000 (14:03 +0200)]
make this test a bit more tolerant when checking sleep time
Anatol Belski [Thu, 11 Sep 2014 11:12:54 +0000 (13:12 +0200)]
remove extra semicolon
Anatol Belski [Fri, 12 Sep 2014 12:37:54 +0000 (14:37 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fixed the cast and incompatible pointer warning
Conflicts:
sapi/cgi/fastcgi.c