clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 23:06:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,916 Commits 494 Branches 1,367 Tags 802 MiB
858c076810
Commit Graph

79916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bob Weinand
d298425323 Inform about back command existence in help - Fixes krakjoe/phpdbg#100 
No way to list the current stack/frames
 2014-06-29 11:55:42 +02:00
Bob Weinand
16ae792988 Fix issue krakjoe/phpdbg#98 
break if does not seem to work
 2014-06-29 11:42:40 +02:00
Bob Weinand
ef77d84061 Merge pull request #102 from dshafik/fix-96 
Fix typo in `finish` help
 2014-06-29 11:28:44 +02:00
Bob Weinand
debc20df80 Merge pull request #101 from dshafik/fix-95 
Replace incorrect `E` command with `ev` in watch help
 2014-06-29 11:28:33 +02:00
Bob Weinand
986a89ae1b Fix issue krakjoe/phpdbg#99 
register function has the same behavior as run
 2014-06-29 11:26:27 +02:00
Bob Weinand
219beac36b Fix readline/libedit (Thanks to @remicollet) 2014-06-29 11:26:03 +02:00
Davey Shafik
2e66754408 Replace incorrect E command with ev in watch help 
Fixes #95
 2014-06-29 04:44:02 -04:00
Davey Shafik
4ac8966030 Fix typo in finish help 
Fixes #96
 2014-06-29 04:32:01 -04:00
Ferenc Kovacs
99967ac075 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  removing the format added by mistake, props to Solar Designer for spotting this.
 2014-06-27 16:29:35 +02:00
Ferenc Kovacs
293a48cb9d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  removing the format added by mistake, props to Solar Designer for spotting this.
 2014-06-27 16:28:24 +02:00
Ferenc Kovacs
cc22f021fe removing the format added by mistake, props to Solar Designer for spotting this. 2014-06-27 16:27:36 +02:00
Remi Collet
f201d061ba NEWS 2014-06-27 09:51:34 +02:00
Remi Collet
37aa57cd1b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  NEWS
  Fix Bug #67531 	syslog cannot be set in pool configuration
  Fix Bug #67530 	error_log=syslog ignored
 2014-06-27 09:51:15 +02:00
Remi Collet
6c72ea87fd NEWS 2014-06-27 09:50:43 +02:00
Remi Collet
13c5bb9600 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fix Bug #67531 	syslog cannot be set in pool configuration
  Fix Bug #67530 	error_log=syslog ignored
 2014-06-27 09:50:27 +02:00
Remi Collet
334758794d NEWS 2014-06-27 09:50:01 +02:00
Remi Collet
bf328b1681 Fix Bug #67531 syslog cannot be set in pool configuration 
error_log is listed in FPM_PHP_INI_TO_EXPAND,
but should not be expand when value = syslog
 2014-06-27 09:47:28 +02:00
Remi Collet
a0ecb3794f Fix Bug #67530 error_log=syslog ignored 
As for Bug #64915
Systemd use --nodaemonize but need to error_log to file or syslog to be honoured
 2014-06-27 09:45:53 +02:00
Stanislav Malyshev
1255aa9130 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update the date
  better explanation
 2014-06-26 21:18:06 -07:00
Stanislav Malyshev
b1433d86b2 Merge branch 'PHp-5.4' into PHP-5.5 
* PHp-5.4:
  update the date
  better explanation
 2014-06-26 21:16:15 -07:00
Stanislav Malyshev
2db96fea2d update the date 2014-06-26 21:15:47 -07:00
Stanislav Malyshev
b23460063f better explanation 2014-06-26 15:25:19 -07:00
Stanislav Malyshev
1d81a1c354 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  more extensive note on unserialize() change
  more extensive note on unserialize() change
 2014-06-26 10:40:36 -07:00
Stanislav Malyshev
b5003c3a86 more extensive note on unserialize() change 2014-06-26 10:39:38 -07:00
Stanislav Malyshev
d4267ce03a Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  more extensive note on unserialize() change
 2014-06-26 10:36:38 -07:00
Stanislav Malyshev
ad9ed232e7 more extensive note on unserialize() change 2014-06-26 10:35:47 -07:00
Bob Weinand
09b2510df6 Merge sapi/phpdbg into PHP-5.6 2014-06-25 13:56:45 +02:00
Bob Weinand
858b45d4ad Merge branch 'master' of https://github.com/oerdnj/phpdbg into master 
Rewritten author line and included instructions to make install the man page
 2014-06-25 13:31:24 +02:00
Stanislav Malyshev
78c3ca105b remove bug67072_2 test for 5.6+ since we'd have cleaner solution 2014-06-24 11:24:07 -07:00
Stanislav Malyshev
b4c046d156 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix test - because of big #67397 we don't allow overlong locales anymore
 2014-06-24 11:23:48 -07:00
Stanislav Malyshev
2ee09835c1 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix test - because of big #67397 we don't allow overlong locales anymore
 2014-06-24 11:23:02 -07:00
Stanislav Malyshev
9d1d25e625 Fix test - because of big #67397 we don't allow overlong locales anymore 2014-06-24 11:21:43 -07:00
Stanislav Malyshev
03b3013ca9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update NEWS
  5.4.30
  Better fix for bug #67072 with more BC provisions
  Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
  update CVE
  Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
  Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
  Fix bug #67349: Locale::parseLocale Double Free
  add CVEs
  Fix potential segfault in dns_get_record()
  Fix bug #66127 (Segmentation fault with ArrayObject unset)
  5.4.30 rc1
 2014-06-24 10:30:56 -07:00
Stanislav Malyshev
cfe06eb2b1 Better fix for bug #67072 with more BC provisions 2014-06-24 10:30:03 -07:00
Stanislav Malyshev
84f9fe0fdc Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability 2014-06-24 10:29:26 -07:00
Stanislav Malyshev
b03993dde9 Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion 2014-06-24 10:29:26 -07:00
Stanislav Malyshev
f48b8f3339 Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1)) 2014-06-24 10:29:25 -07:00
Stanislav Malyshev
844a046945 Fix bug #67349: Locale::parseLocale Double Free 2014-06-24 10:29:09 -07:00
Stanislav Malyshev
e2ed4874b5 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  5.4.30
  Better fix for bug #67072 with more BC provisions
  Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
  update CVE
  Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
  Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
  Fix bug #67349: Locale::parseLocale Double Free
  add CVEs
  Fix potential segfault in dns_get_record()
  Fix bug #66127 (Segmentation fault with ArrayObject unset)
  5.4.30 rc1

Conflicts:
	ext/intl/locale/locale_methods.c
 2014-06-24 10:25:09 -07:00
Stanislav Malyshev
3488cf6fd8 Merge branch 'PHP-5.4.30' into PHP-5.4 
* PHP-5.4.30:
  5.4.30
  Better fix for bug #67072 with more BC provisions
  Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
  update CVE
  Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
  Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
  Fix bug #67349: Locale::parseLocale Double Free
  add CVEs
  Fix potential segfault in dns_get_record()
  Fix bug #66127 (Segmentation fault with ArrayObject unset)
  5.4.30 rc1

Conflicts:
	configure.in
	main/php_version.h
 2014-06-24 10:23:36 -07:00
Stanislav Malyshev
7ffcb48184 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  update NEWS
 2014-06-24 10:20:51 -07:00
Stanislav Malyshev
08e7252abf update NEWS 2014-06-24 10:20:33 -07:00
Stanislav Malyshev
79457d1964 5.4.30 2014-06-24 10:17:49 -07:00
Xinchen Hui
9d49492fd6 Fixed bug #67368 (Memory leak with immediately dereferenced array in class constant) 2014-06-24 13:53:05 +08:00
Stanislav Malyshev
6d97b4b2b3 Better fix for bug #67072 with more BC provisions 2014-06-23 22:16:25 -07:00
Stanislav Malyshev
6b8cef7847 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Better fix for bug #67072 with more BC provisions
  Better fix for bug #67072 with more BC provisions

Conflicts:
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
 2014-06-23 22:15:01 -07:00
Stanislav Malyshev
232ab8d795 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Better fix for bug #67072 with more BC provisions
 2014-06-23 22:13:32 -07:00
Ondřej Surý
62b6cdbbd7 Add initial manual page for phpdbg.1 2014-06-23 11:35:42 +02:00
Remi Collet
b3ef019b62 NEWS 2014-06-23 10:39:06 +02:00
Remi Collet
0da5d94a6c Better fix for phpdbg + libedit 
- fix include
- disable coloured prompt only with libedit
 2014-06-23 10:21:19 +02:00