diff options
| author | Xinchen Hui <laruence@gmail.com> | 2015-08-30 08:00:15 -0700 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2015-08-30 08:00:15 -0700 |
| commit | a68e577b4e8ac0cb54708da8de18fc47ad399f5e (patch) | |
| tree | cf1d9edad89e43d8b958131c88fd328e1f849095 | |
| parent | 871545fdd015a300faf55bd641ed0871db046e93 (diff) | |
| parent | 76a0cbc0c2e30c47262191d60d73f56857f5fcb0 (diff) | |
| download | php-git-a68e577b4e8ac0cb54708da8de18fc47ad399f5e.tar.gz | |
Merge branch 'master' of https://github.com/softwarespot/php-src
| -rw-r--r-- | php.ini-development | 4 | ||||
| -rw-r--r-- | php.ini-production | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/php.ini-development b/php.ini-development index 592a042732..0a4cc87c2e 100644 --- a/php.ini-development +++ b/php.ini-development @@ -888,8 +888,8 @@ default_socket_timeout = 60 ;extension=php_pgsql.dll ;extension=php_shmop.dll -; The MIBS data available in the PHP distribution must be installed. -; See http://www.php.net/manual/en/snmp.installation.php +; The MIBS data available in the PHP distribution must be installed. +; See http://www.php.net/manual/en/snmp.installation.php ;extension=php_snmp.dll ;extension=php_soap.dll diff --git a/php.ini-production b/php.ini-production index 9febdf8232..47ee9e5e3a 100644 --- a/php.ini-production +++ b/php.ini-production @@ -888,8 +888,8 @@ default_socket_timeout = 60 ;extension=php_pgsql.dll ;extension=php_shmop.dll -; The MIBS data available in the PHP distribution must be installed. -; See http://www.php.net/manual/en/snmp.installation.php +; The MIBS data available in the PHP distribution must be installed. +; See http://www.php.net/manual/en/snmp.installation.php ;extension=php_snmp.dll ;extension=php_soap.dll @@ -1522,9 +1522,9 @@ url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry" ; 0: Jump over assertion at run-time ; 1: Execute assertions ; Changing from or to a negative value is only possible in php.ini! (For turning assertions on and off at run-time, see assert.active, when zend.assertions = 1) -; Default Value: 1 -; Development Value: 1 -; Production Value: -1 +; Default Value: 1 +; Development Value: 1 +; Production Value: -1 ; http://php.net/zend.assertions zend.assertions = -1 |