summaryrefslogtreecommitdiff
path: root/Zend
diff options
context:
space:
mode:
authorDerick Rethans <derick@php.net>2004-12-13 09:09:06 +0000
committerDerick Rethans <derick@php.net>2004-12-13 09:09:06 +0000
commitd91a531d2e1429bf8ae3b4a7c0ce430e45c3dfbf (patch)
tree689b09a94c860d0f919244fd0970d0b2cb09ea0c /Zend
parenteafd2ef88e0f4d24fa1d282f67a0882c885e11e6 (diff)
downloadphp-git-d91a531d2e1429bf8ae3b4a7c0ce430e45c3dfbf.tar.gz
- Added "G" modifier to ini setting number format.
Diffstat (limited to 'Zend')
-rw-r--r--Zend/zend_operators.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index cf63461668..7806167cce 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -43,13 +43,17 @@ ZEND_API int zend_atoi(const char *str, int str_len)
retval = strtol(str, NULL, 0);
if (str_len>0) {
switch (str[str_len-1]) {
- case 'k':
- case 'K':
+ case 'g':
+ case 'G':
retval *= 1024;
- break;
+ /* break intentionally missing */
case 'm':
case 'M':
- retval *= 1048576;
+ retval *= 1024;
+ /* break intentionally missing */
+ case 'k':
+ case 'K':
+ retval *= 1024;
break;
}
}