]> granicus.if.org Git - php/log
php
10 years agoMerge branch 'PHP-5.6'
Remi Collet [Mon, 15 Sep 2014 11:32:37 +0000 (13:32 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  NEWS
  Fixed bug #65641 PHP-FPM incorrectly defines the SCRIPT_NAME variable when using Apache

10 years agoNEWS
Remi Collet [Mon, 15 Sep 2014 11:32:13 +0000 (13:32 +0200)]
NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Remi Collet [Mon, 15 Sep 2014 11:31:26 +0000 (13:31 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  Fixed bug #65641 PHP-FPM incorrectly defines the SCRIPT_NAME variable when using Apache

10 years agoNEWS
Remi Collet [Mon, 15 Sep 2014 11:31:17 +0000 (13:31 +0200)]
NEWS

10 years agoFixed bug #65641 PHP-FPM incorrectly defines the SCRIPT_NAME variable when using...
Remi Collet [Mon, 15 Sep 2014 11:29:55 +0000 (13:29 +0200)]
Fixed bug #65641 PHP-FPM incorrectly defines the SCRIPT_NAME variable when using Apache

ProxyPass is unable to provide correct PATH_INFO
as it is not aware of file path (while SetHandler is).

As we can extract PATH_INFO from PATH_TRANSLATED,
we also need to check if present in SCRIPT_NAME
and remove it.

After applying this patch.
With mod_php
_SERVER["REQUEST_URI"]     /info.php/foo/bar?q=1
_SERVER["SCRIPT_NAME"]     /info.php
_SERVER["PATH_INFO"]       /foor/bar
_SERVER["PHP_SELF"]        /info.php/foo/bar
_SERVER["QUERY_STRING"]    q=1

With mod_proxy_fcgi + SetHandler
_SERVER["REQUEST_URI"]     /info.php/foo/bar?q=1
_SERVER["SCRIPT_NAME"]     /info.php
_SERVER["PATH_INFO"]       /foo/bar
_SERVER["PHP_SELF"]        /info.php/foo/bar
_SERVER["QUERY_STRING"]    q=1

With mod_proxy_fcgi + ProxyPass
_SERVER["REQUEST_URI"]     /info.php/foo/bar?q=1
_SERVER["SCRIPT_NAME"]     /info.php
_SERVER["PATH_INFO"]       /foo/bar
_SERVER["PHP_SELF"]        /info.php/foo/bar
_SERVER["QUERY_STRING"]    q=1

10 years agocorrect fix to the natcmp_ex
Anatol Belski [Mon, 15 Sep 2014 10:54:46 +0000 (12:54 +0200)]
correct fix to the natcmp_ex

Till now the actualy length diff between the strings was under
circumstances returned. Whereby for a compare function only return
values of (1, 0, -1) make sense. Thus the old behavior isn't
present anymore, natcmp_ex now behaves as a standard compare function.

10 years agofix signed/unsigned mismatch
Anatol Belski [Mon, 15 Sep 2014 10:12:18 +0000 (12:12 +0200)]
fix signed/unsigned mismatch

10 years agofix signed/unsigned mismatch
Anatol Belski [Mon, 15 Sep 2014 10:08:42 +0000 (12:08 +0200)]
fix signed/unsigned mismatch

10 years agofix unsigned negation
Anatol Belski [Mon, 15 Sep 2014 09:59:48 +0000 (11:59 +0200)]
fix unsigned negation

10 years agofix signed/unsigned mismatch
Anatol Belski [Mon, 15 Sep 2014 09:40:18 +0000 (11:40 +0200)]
fix signed/unsigned mismatch

10 years agoMerge branch 'master' of git.php.net:php-src
Dmitry Stogov [Mon, 15 Sep 2014 10:37:59 +0000 (14:37 +0400)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  fix initializer struct
  fix signature
  fix type
  fix condition

10 years agoReplaced macro with better optimized inline function
Dmitry Stogov [Mon, 15 Sep 2014 10:36:55 +0000 (14:36 +0400)]
Replaced macro with better optimized inline function

10 years agofix initializer struct
Anatol Belski [Mon, 15 Sep 2014 09:28:24 +0000 (11:28 +0200)]
fix initializer struct

10 years agofix signature
Anatol Belski [Mon, 15 Sep 2014 09:13:55 +0000 (11:13 +0200)]
fix signature

10 years agofix type
Anatol Belski [Mon, 15 Sep 2014 08:57:04 +0000 (10:57 +0200)]
fix type

10 years agofix condition
Anatol Belski [Mon, 15 Sep 2014 08:51:56 +0000 (10:51 +0200)]
fix condition

10 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Mon, 15 Sep 2014 08:54:36 +0000 (16:54 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src

10 years agoRemove redundant codes
Xinchen Hui [Mon, 15 Sep 2014 08:52:33 +0000 (16:52 +0800)]
Remove redundant codes

10 years agofix type
Anatol Belski [Mon, 15 Sep 2014 08:39:51 +0000 (10:39 +0200)]
fix type

10 years agooptimize path length retrieval
Kalle Sommer Nielsen [Mon, 15 Sep 2014 08:35:39 +0000 (10:35 +0200)]
optimize path length retrieval

10 years agoMerge branch 'PHP-5.6'
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

10 years agoupdated NEWS
Anatol Belski [Mon, 15 Sep 2014 08:29:00 +0000 (10:29 +0200)]
updated NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

10 years agoupdated NEWS
Anatol Belski [Mon, 15 Sep 2014 08:27:52 +0000 (10:27 +0200)]
updated NEWS

10 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Mon, 15 Sep 2014 06:50:16 +0000 (14:50 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src

10 years agoAdd test script for the segfault in gc while run phpspec
Xinchen Hui [Mon, 15 Sep 2014 06:49:34 +0000 (14:49 +0800)]
Add test script for the segfault in gc while run phpspec

10 years agoMerge branch 'PHP-5.6'
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

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

10 years agoFix NEWS
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

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
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

10 years agoFix NEWS
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

10 years agoMerge phpdbg into PHP-5.6
Bob Weinand [Mon, 15 Sep 2014 03:48:09 +0000 (05:48 +0200)]
Merge phpdbg into PHP-5.6

10 years agoavoid strlen usage in the loop
Anatol Belski [Sun, 14 Sep 2014 22:39:55 +0000 (00:39 +0200)]
avoid strlen usage in the loop

10 years agofix format
Anatol Belski [Sun, 14 Sep 2014 21:10:41 +0000 (23:10 +0200)]
fix format

10 years agofix ftell/fseek calls
Anatol Belski [Sun, 14 Sep 2014 21:03:13 +0000 (23:03 +0200)]
fix ftell/fseek calls

10 years agoreduce struct size by 8 byte on 64 bit
Anatol Belski [Sun, 14 Sep 2014 20:31:01 +0000 (22:31 +0200)]
reduce struct size by 8 byte on 64 bit

10 years agofix ftell/fseek calls
Anatol Belski [Sun, 14 Sep 2014 20:28:42 +0000 (22:28 +0200)]
fix ftell/fseek calls

10 years agobetter way to check for empty string
Anatol Belski [Sun, 14 Sep 2014 20:07:38 +0000 (22:07 +0200)]
better way to check for empty string

10 years agomake xml_utf8_ encode/decode work with size_t
Anatol Belski [Sun, 14 Sep 2014 19:38:46 +0000 (21:38 +0200)]
make xml_utf8_ encode/decode work with size_t

10 years agoavoid repeated strlen usage
Anatol Belski [Sun, 14 Sep 2014 15:00:34 +0000 (17:00 +0200)]
avoid repeated strlen usage

10 years agoavoid strlen() usage in loop
Anatol Belski [Sun, 14 Sep 2014 15:00:06 +0000 (17:00 +0200)]
avoid strlen() usage in loop

10 years agofix int overflow preserving the old behavior
Anatol Belski [Sun, 14 Sep 2014 14:37:38 +0000 (16:37 +0200)]
fix int overflow preserving the old behavior

10 years agoFix use of stack variable outside its block
Nikita Popov [Sat, 13 Sep 2014 21:30:32 +0000 (23:30 +0200)]
Fix use of stack variable outside its block

10 years agozend_get_property_info takes a zend_string* now
Nikita Popov [Sat, 13 Sep 2014 21:14:04 +0000 (23:14 +0200)]
zend_get_property_info takes a zend_string* now

10 years agouse nice way to achieve the property name length
Anatol Belski [Sun, 14 Sep 2014 13:09:54 +0000 (15:09 +0200)]
use nice way to achieve the property name length

10 years agomake it safer for an array underrun
Anatol Belski [Sun, 14 Sep 2014 13:03:52 +0000 (15:03 +0200)]
make it safer for an array underrun

10 years agofix type
Anatol Belski [Sun, 14 Sep 2014 12:43:39 +0000 (14:43 +0200)]
fix type

10 years agoavoid repeated strlen() usage
Anatol Belski [Sun, 14 Sep 2014 10:59:31 +0000 (12:59 +0200)]
avoid repeated strlen() usage

10 years agoreduce struct size by 8 bytes on 64 bit
Anatol Belski [Sun, 14 Sep 2014 10:32:38 +0000 (12:32 +0200)]
reduce struct size by 8 bytes on 64 bit

10 years agoavoid repeated strlen() usage
Anatol Belski [Sun, 14 Sep 2014 10:30:01 +0000 (12:30 +0200)]
avoid repeated strlen() usage

10 years agoFix bug #111 (compile error without ZEND_SIGNALS)
Bob Weinand [Sun, 14 Sep 2014 10:24:56 +0000 (12:24 +0200)]
Fix bug #111 (compile error without ZEND_SIGNALS)

10 years agofix possible pointer truncation
Anatol Belski [Sun, 14 Sep 2014 10:18:52 +0000 (12:18 +0200)]
fix possible pointer truncation

10 years agobetter way to zero away sensitive data
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

10 years agoreduce struct size by 8 byte on 64 bit
Anatol Belski [Sun, 14 Sep 2014 09:36:11 +0000 (11:36 +0200)]
reduce struct size by 8 byte on 64 bit

10 years agoreduce 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

10 years agoreduce struct sizes by 8 bytes each 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

10 years agoremove useless casts and checks
Anatol Belski [Sun, 14 Sep 2014 09:00:22 +0000 (11:00 +0200)]
remove useless casts and checks

10 years agoalign 4 byte to the start of the word
Anatol Belski [Sun, 14 Sep 2014 08:27:00 +0000 (10:27 +0200)]
align 4 byte to the start of the word

10 years agofix conditions
Anatol Belski [Sun, 14 Sep 2014 08:24:10 +0000 (10:24 +0200)]
fix conditions

substraction from an unsigned

10 years agoreduce the struct size by 8 byte on 64 bit
Anatol Belski [Sun, 14 Sep 2014 07:40:56 +0000 (09:40 +0200)]
reduce the struct size by 8 byte on 64 bit

10 years agoreduce 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

10 years agoreduce 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

10 years agoreduce 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

10 years agoreduce 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

10 years agoreduce 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

10 years agouse the generator to produce the header
Anatol Belski [Sat, 13 Sep 2014 22:43:58 +0000 (00:43 +0200)]
use the generator to produce the header

10 years agoupdate the html table generator
Anatol Belski [Sat, 13 Sep 2014 22:42:48 +0000 (00:42 +0200)]
update the html table generator

10 years agoremoved the emalloc result check, out of memory will bailout
Anatol Belski [Sat, 13 Sep 2014 22:00:52 +0000 (00:00 +0200)]
removed the emalloc result check, out of memory will bailout

10 years agoreplaced the check with assert as it's kinda unusual case
Anatol Belski [Sat, 13 Sep 2014 21:57:53 +0000 (23:57 +0200)]
replaced the check with assert as it's kinda unusual case

10 years agoremoved extra 1 byte member, padding will be done anyway by the compiler
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

10 years agoreduce struct size by 8 byte on 64 bit
Anatol Belski [Sat, 13 Sep 2014 21:34:08 +0000 (23:34 +0200)]
reduce struct size by 8 byte on 64 bit

10 years agoavoid usage of strlen() in the loop
Anatol Belski [Sat, 13 Sep 2014 19:44:40 +0000 (21:44 +0200)]
avoid usage of strlen() in the loop

10 years agoreduce struct size by 8 byte on 64 bit
Anatol Belski [Sat, 13 Sep 2014 19:22:57 +0000 (21:22 +0200)]
reduce struct size by 8 byte on 64 bit

10 years agobetter align reduce the 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

10 years agoreduce the struct size (under circumstances) 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

10 years agocheck if the winver was indeed fetched
Anatol Belski [Sat, 13 Sep 2014 18:42:46 +0000 (20:42 +0200)]
check if the winver was indeed fetched

10 years agocheck emalloc() result
Anatol Belski [Sat, 13 Sep 2014 18:20:17 +0000 (20:20 +0200)]
check emalloc() result

10 years agobetter way to check for an empty string
Anatol Belski [Sat, 13 Sep 2014 18:12:21 +0000 (20:12 +0200)]
better way to check for an empty string

10 years agoreduce the union size from 24 to 16 bytes on 64 bit
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

10 years agofix condition
Anatol Belski [Sat, 13 Sep 2014 16:20:24 +0000 (18:20 +0200)]
fix condition

comparsion of two unsigned

10 years agoavoid multiple strlen() usage
Anatol Belski [Sat, 13 Sep 2014 16:09:30 +0000 (18:09 +0200)]
avoid multiple strlen() usage

10 years agoavoid multiple strlen() calls for the same
Anatol Belski [Sat, 13 Sep 2014 15:58:47 +0000 (17:58 +0200)]
avoid multiple strlen() calls for the same

10 years agoreduced struct sizes by 8 byte each on 64 bit
Anatol Belski [Sat, 13 Sep 2014 15:47:42 +0000 (17:47 +0200)]
reduced struct sizes by 8 byte each on 64 bit

10 years agofix condition
Anatol Belski [Sat, 13 Sep 2014 15:35:59 +0000 (17:35 +0200)]
fix condition

substraction of two unsigned

10 years agoreduce struct sizes by 8 byte on 64 bit
Anatol Belski [Sat, 13 Sep 2014 12:26:59 +0000 (14:26 +0200)]
reduce struct sizes by 8 byte on 64 bit

10 years agoavoid strlen() usage in the loop
Anatol Belski [Sat, 13 Sep 2014 12:19:39 +0000 (14:19 +0200)]
avoid strlen() usage in the loop

10 years agoDrop superfluous opline for non-cv variables
Nikita Popov [Sat, 13 Sep 2014 20:25:58 +0000 (22:25 +0200)]
Drop superfluous opline for non-cv variables

10 years agoDrop dead assignments
Nikita Popov [Sat, 13 Sep 2014 20:21:35 +0000 (22:21 +0200)]
Drop dead assignments

10 years agoMake zend_llist_remove_tail a void function
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.

10 years agoUse more accurate sizeof
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.

10 years agoAlso skip line-overwriting if SHOW_ONLY_GROUPS is used
Nikita Popov [Thu, 11 Sep 2014 21:21:40 +0000 (23:21 +0200)]
Also skip line-overwriting if SHOW_ONLY_GROUPS is used

10 years agoswitch to using mbrlen with VS
Anatol Belski [Sat, 13 Sep 2014 11:52:10 +0000 (13:52 +0200)]
switch to using mbrlen with VS

10 years agoreduce the struct size by 8 byte on 64 bit
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

10 years agoreduced the struct size by 8 byte on 64 bit
Anatol Belski [Sat, 13 Sep 2014 10:49:10 +0000 (12:49 +0200)]
reduced the struct size by 8 byte on 64 bit

10 years agofix condition
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.

10 years agoreduce the struct size by 8 byte on 64 bit
Anatol Belski [Fri, 12 Sep 2014 21:27:55 +0000 (23:27 +0200)]
reduce the struct size by 8 byte on 64 bit

10 years agoreduce the struct size by 8 bytes 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

10 years agoreduce the struct size by 8 byte on x64
Anatol Belski [Fri, 12 Sep 2014 21:08:09 +0000 (23:08 +0200)]
reduce the struct size by 8 byte on x64

10 years agofix possible null ptr deref
Anatol Belski [Fri, 12 Sep 2014 20:31:02 +0000 (22:31 +0200)]
fix possible null ptr deref

10 years agofix possible nullptr derefrence
Anatol Belski [Fri, 12 Sep 2014 20:18:06 +0000 (22:18 +0200)]
fix possible nullptr derefrence